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