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