CS fixes
Merge branch '1.1.x' into stable

Conflicts:
	engine/PerlLib/Common/SingletonClass.pm