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