Merging in 3.2.2 changes (basically just changelog)