Merge deegree master