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