Merged 0.46 into master
merge 0.46 branch
merge 0.46
Merge branch '0.46'
Merge branch 'master' into development