Merge branch 'MDL-66877-master' of git://github.com/jleyva/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 2 Dec 2019 02:01:53 +0000 (10:01 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 2 Dec 2019 02:01:53 +0000 (10:01 +0800)

Trivial merge