Merge branch 'MDL-66143-master' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 22 Jul 2019 05:47:17 +0000 (13:47 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 22 Jul 2019 05:47:17 +0000 (13:47 +0800)

Trivial merge