Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:56:03 +0000 (09:56 +0100)
committerMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:56:03 +0000 (09:56 +0100)

Trivial merge