Had a problem with register.php. Fixed it.
Merge remote-tracking branch 'origin/Charlie'