Merge branch 'hotfix/3.2.5' into develop
authormartinko <gamato@users.sf.net>
Wed, 29 Oct 2014 08:51:14 +0000 (09:51 +0100)
committermartinko <gamato@users.sf.net>
Wed, 29 Oct 2014 08:51:14 +0000 (09:51 +0100)

Trivial merge