Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Thu, 11 Jun 2015 11:21:45 +0000 (13:21 +0200)
committerMirio <opivy@hotmail.de>
Thu, 11 Jun 2015 11:21:45 +0000 (13:21 +0200)

Trivial merge