Merge commit '8f01299f1b1b0d2f03c4d727eb0fa07428fbdbc9'

Conflicts:
	thirdparty/filefrommaster.txt