Merge branch 'master' into 1.6

Conflicts:
	Plugin/Ckeditor
adminTabs(): Allow passing data and options to View::element()