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