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