Merge branch 'MDL-65538-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 02:55:43 +0000 (10:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 02:55:43 +0000 (10:55 +0800)

Trivial merge