Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle