Merge remote-tracking branch 'upstream/kk44' into kk44

Conflicts:
	core/llvm_config.mk
Merge branch 'kk44' of github.com:usmcamgrimm/build into kk44