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