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