Merge remote-tracking branch 'origin/master' into gen_coord_type

Conflicts:
	CMakeLists.txt