Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:15:20 +0000 (20:15 +0100)
committerMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:15:20 +0000 (20:15 +0100)

Trivial merge