Merge branch 'MDL-61665-master' of https://github.com/iamandrew/moodle