Merge branch 'MDL-66399-master-6' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 Nov 2019 02:45:22 +0000 (10:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 Nov 2019 02:45:22 +0000 (10:45 +0800)

Trivial merge