Merge branch 'hotfix/3.2.4' into develop
authormartinko <[email protected]>
Mon, 27 Oct 2014 09:53:23 +0000 (10:53 +0100)
committermartinko <[email protected]>
Mon, 27 Oct 2014 09:53:23 +0000 (10:53 +0100)

Trivial merge