Merge branch 'hotfix/3.2.6' master 3.2.6
authormartinko <gamato@users.sf.net>
Wed, 5 Nov 2014 15:00:53 +0000 (16:00 +0100)
committermartinko <gamato@users.sf.net>
Wed, 5 Nov 2014 15:00:53 +0000 (16:00 +0100)

Trivial merge