Merge commit 'f8d1ba9e2d466fdcbdf0fe74a9c736687b7e75a7'

Conflicts:
	thirdparty/filefrommaster.txt