Merge branch 'master' into test1

Conflicts:
	SkinInfo.xml