Merge branch 'MDL-65595-master' of git://github.com/peterRd/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Aug 2019 02:28:15 +0000 (10:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Aug 2019 02:28:15 +0000 (10:28 +0800)

Trivial merge