Merge branch 'wip-MDL-66918-master' of https://github.com/Beedell/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 16 Jan 2020 03:42:16 +0000 (11:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 16 Jan 2020 03:42:16 +0000 (11:42 +0800)

Trivial merge