Merge branch 'master' into gsoc-android-2