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