Update to version 3.2

Merge version 3.2 into master.