Merge branch 'dev'

Conflicts:
	CMakeLists.txt