Merge branch 'MDL-66581-master' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 2 Dec 2019 08:12:00 +0000 (16:12 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 2 Dec 2019 08:12:00 +0000 (16:12 +0800)

Trivial merge