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