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