Merge branch 'MDL-37564' of https://github.com/nebgor/moodle