Reduce support note size (Fixes #290)
Only show email validation nag when appropriate (Fixes #287)
Simplify alternate login
Merge remote branch 'origin/master'
Port 89af12c (Fixes #289)
Pass came_from via GET (For #247)
Merge branch 'master' into record-timings