Merge branch 'prerelease-3.2.1'
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Thu, 7 May 2015 00:35:28 +0000 (02:35 +0200)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Thu, 7 May 2015 00:35:28 +0000 (02:35 +0200)

Trivial merge