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