Merge branch 'MDL-65400-master' of git://github.com/jleyva/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 24 Oct 2019 01:28:31 +0000 (09:28 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 24 Oct 2019 01:28:31 +0000 (09:28 +0800)

Trivial merge