Preparing release 3.2
Back to development: 3.3
Merge branch 'R2014-5'
This branch was created just for making a release because I had not
properly made a feature branch. Commit ac27dfe87e and everything after
is not in release 3.2 but will be in the next one. Sorry about that.