Merge branch 'develop' into hotfix/3.2.6
authormartinko <[email protected]>
Wed, 5 Nov 2014 14:59:38 +0000 (15:59 +0100)
committermartinko <[email protected]>
Wed, 5 Nov 2014 14:59:38 +0000 (15:59 +0100)

Trivial merge