Merge branch 'upstream' into LLNW

Conflicts:
	Makefile