Merge branch 'MDL-65883-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 20 Jun 2019 01:12:46 +0000 (09:12 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 20 Jun 2019 01:12:46 +0000 (09:12 +0800)

Trivial merge