Merge branch 'MDL-66915-master' of https://github.com/MartinGauk/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 21 Oct 2019 07:54:12 +0000 (15:54 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 21 Oct 2019 07:54:12 +0000 (15:54 +0800)

Trivial merge