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