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