Merge remote-tracking branch 'upstream/master'

Conflicts:
	CMakeLists.txt
	src/CADMesh.cc