Merge branch 'MDL-32620' of git://github.com/scriby/moodle