Redo
Merge branch '2.30'

Conflicts:
	type/Base.class.php