Merge branch 'master' into dev
2.0.5 - Improved keyboard search
Merge branch 'dev'