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