Buttons aren't containers.  Put them in one if needed.
Fixes habari/habari#456

Conflicts:
	admin/formcontrols/admincontrol_submit.php