Merge branch '3.2' into 'master'