Synchronized with master
Synchronized with master

VibekeSkytt/GoTools,SINTEF-Geometry/GoTools,sbriseid/GoTools,SINTEF-Geometry/GoTools,sbriseid/GoTools,SINTEF-Geometry/GoTools,VibekeSkytt/GoTools,VibekeSkytt/GoTools,sbriseid/GoTools