Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 3 Dec 2014 23:06:00 +0000 (00:06 +0100)
committerMirio <opivy@hotmail.de>
Wed, 3 Dec 2014 23:06:00 +0000 (00:06 +0100)

Trivial merge