Remove message object.
Merge regexes.

Conflicts:
	nzedb/controllers/Binaries.php