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