Fix: Missing special code
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php