Merge branch 'MDL-49103-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Feb 2020 05:48:29 +0000 (13:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Feb 2020 05:48:29 +0000 (13:48 +0800)

Trivial merge