Bump to 2.0.4 dev.
Fix the recaptcha registration URL.

Apparently google moved the registration page for recaptcha and didn't keep the
old URL functional. Trivial fix.

Fixes bug 3471.
Merge branch 'release-1.7.x' into release-2.0.x
Merge branch 'release-2.0.x'