Merge changes from 3.2 into 3.3

Leaving this for future reference. Thanks @rafi!