Merging 3.2.0 into master