dev branch to master

username-removed-537586 requested to merge 3.2 into master Jul 23, 2016