commit from master
Merge commit 'a6f58b7110ccc0f11ae521b030416d5d04494f6d'

Conflicts:
	thirdparty/filefrommaster.txt