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