Merge branch 'MDL-65429-master' of git://github.com/peterRd/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Sep 2019 06:21:42 +0000 (14:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Sep 2019 06:21:42 +0000 (14:21 +0800)

Trivial merge