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