Prepare for release
Merge branch 'master' into android-studio