Merge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle