Merge branch 'release/skytools_3_1_5' into develop
authormartinko <[email protected]>
Fri, 9 Aug 2013 14:03:35 +0000 (16:03 +0200)
committermartinko <[email protected]>
Fri, 9 Aug 2013 14:03:35 +0000 (16:03 +0200)

Trivial merge