Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle