Merge branch 'master' into dev
2.0.4 - Scroll to selected via keyboard search
Merge branch 'dev'
Merge branch 'master' into gh-pages