Merging deegree master into latlon master