Prepare for release
Merge branch 'master' into tourapp
Prepare for release