Rollback changes I accidentally made on master branch. These will be added back into master for at next release.
Merge changes
Merge branch 'master' into develop
Fix merge conflict