Merge deegree master into latlon master