Prepare 0.3.2 release, to fix some merge bustage in 0.3.1