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