Sync with release 3.2.0.

Using the GitHub UI to merge srichter's release of my pull request.