Merge branch 'MDL-32028' of git://github.com/nebgor/moodle