Merge branch 'MDL-65557-master' of https://github.com/ryanwyllie/moodle