Merge branch 'MDL-16464' of https://github.com/timhunt/moodle