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