Merge branch 'MDL-62161' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Sep 2019 03:26:19 +0000 (11:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Sep 2019 03:26:19 +0000 (11:26 +0800)

Trivial merge