Merge branch 'hotfix/3.1.5.3' 3.1.5.3
authormartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 12:40:41 +0000 (14:40 +0200)
committermartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 12:40:41 +0000 (14:40 +0200)

Trivial merge