Merge branch 'hotfix/3.1.5.4' 3.1.5.4
authormartinko <gamato@users.sf.net>
Tue, 3 Dec 2013 14:58:47 +0000 (15:58 +0100)
committermartinko <gamato@users.sf.net>
Tue, 3 Dec 2013 14:58:47 +0000 (15:58 +0100)

Trivial merge