Merge branch 'master' into gsoc-app-target