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