Merge branch 'hotfix/3.2.1' into develop
authormartinko <[email protected]>
Wed, 9 Apr 2014 15:59:41 +0000 (17:59 +0200)
committermartinko <[email protected]>
Wed, 9 Apr 2014 15:59:41 +0000 (17:59 +0200)

Trivial merge