Merge "Add margin below CAPTCHA box (and above submit) for signup and login"