Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:56:51 +0000 (13:56 +0200)
committerMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:56:51 +0000 (13:56 +0200)

Trivial merge