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