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