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