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