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