test suite update, fix by ref from type class
Merge remote-tracking branch 'origin/master'

Conflicts:
	editor.php