Merge origin/master

Conflicts:
	View/Helper/CKEditorHelper.php