Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle