Merge branch 'MDL-67087-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 Nov 2019 05:16:56 +0000 (13:16 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:21:39 +0000 (19:21 +0800)

Trivial merge