minor fixes
Merge remote-tracking branch 'origin/master' into admin-extensions

Conflicts:
	Admin/StaticContentAdmin.php