Merge remote-tracking branch 'upstream/master' into cilkplus

Conflicts:
	make/platform/clang_linux.mk