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