Changing master branch version to master
Merge branch 'master' into feature/bursting (run by Sean Moe)