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