Merge bugfix-11447

Conflicts:

	engine/src/funcs.cpp