Merge commit '8776ed1029c196607ef9fb31d9629666759826f5' * commit '8776ed1029c196607ef9fb31d9629666759826f5': add searchable dictionary to html docs and dev guide nav
Merge commit '8776ed1029c196607ef9fb31d9629666759826f5' * commit '8776ed1029c196607ef9fb31d9629666759826f5': add searchable dictionary to html docs and dev guide nav