Changing master branch version to master
Merge branch 'master' into develop (run by Sean Moe)