Merge branch 'develop' into hotfix/3.2.1
authormartinko <gamato@users.sf.net>
Wed, 9 Apr 2014 15:21:43 +0000 (17:21 +0200)
committermartinko <gamato@users.sf.net>
Wed, 9 Apr 2014 15:21:43 +0000 (17:21 +0200)

Trivial merge