Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:10:17 +0000 (18:10 +0100)
committerMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:10:17 +0000 (18:10 +0100)

Trivial merge