Merge in changes from 3.2.1b1 release repo.