Merge branch 'master' into llvm-3.4

Conflicts:
	Shake.hs

Conflicts:
	llvm-general/src/LLVM/General/Internal/FFI/ModuleC.cpp