Merge remote-tracking branch 'upstream/master'

Conflicts:
	tools/build/mk/OptionalObsoleteFiles.inc
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'