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