Build with clang on Ubuntu
Merge branch 'master' into llvm

Conflicts:
	CMakeLists.txt