Merge branch 'mdl63321-master' of https://github.com/tlock/moodle