Update from upstream
Merge branch 'master' into hawaii

Conflicts:
	CMakeLists.txt