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