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