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