Merge branch 'r/0.2' into develop
Fix plugins_api filer conflict. (Installer was overwriting search results.)
Merge branch 'develop'