Merge branch 'release/3.2.3' 3.2.3
authormartinko <gamato@users.sf.net>
Wed, 8 Oct 2014 08:44:04 +0000 (10:44 +0200)
committermartinko <gamato@users.sf.net>
Wed, 8 Oct 2014 08:44:04 +0000 (10:44 +0200)

Trivial merge