Merge branch 'MDL-67093-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 4 Nov 2019 07:36:34 +0000 (15:36 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:21:41 +0000 (19:21 +0800)

Trivial merge