Merge branch 'develop' into release/skytools_3_1_5
authormartinko <gamato@users.sf.net>
Wed, 31 Jul 2013 09:26:01 +0000 (11:26 +0200)
committermartinko <gamato@users.sf.net>
Wed, 31 Jul 2013 09:26:01 +0000 (11:26 +0200)

Trivial merge