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