Merge branch 'release/skytools_3_1_5' into develop
authormartinko <gamato@users.sf.net>
Fri, 9 Aug 2013 14:03:35 +0000 (16:03 +0200)
committermartinko <gamato@users.sf.net>
Fri, 9 Aug 2013 14:03:35 +0000 (16:03 +0200)

Trivial merge