bugfix: allow numbers in hostnames
Merge branch 'master' into devel

Conflicts:
	api/lib/simpletypes/hostname.class.php