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