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