Merge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle