Merge branch 'hotfix/3.2.4' 3.2.4
authormartinko <gamato@users.sf.net>
Mon, 27 Oct 2014 09:53:23 +0000 (10:53 +0100)
committermartinko <gamato@users.sf.net>
Mon, 27 Oct 2014 09:53:23 +0000 (10:53 +0100)

Trivial merge