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