Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle