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

Trivial merge