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