Merge branch 'MDL-66599_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 10 Sep 2019 02:46:28 +0000 (10:46 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 10 Sep 2019 02:46:28 +0000 (10:46 +0800)

Trivial merge