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