Merged deegree/deegree3 master into lat-lon/deegree3 master

Merged deegree/deegree3 master into lat-lon/deegree3 master