Minor
Merge branch 'master' into non-square-maps

Conflicts:
	src/lithosphere.cpp
	src/plate.cpp
Ignoring idea files