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