Merge branch 'MDL-33808' of git://github.com/danpoltawski/moodle