merge maarble-devel: return to degrees, THEMIS