Merge branch '1755-handle-internal-server-error-in-registration-form' of github.com:hypothesis/h into 1755-handle-internal-server-error-in-registration-form

Conflicts:
	h/static/scripts/account/auth-controller.coffee