Merging up from dev to master

Fixing the 'custom-custom-2100' name attribute on the sign-up checkbox that doesn't match up with the BSD form name attribute.