Merge branch 'MDL-64570-master-fix1' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Feb 2019 02:52:22 +0000 (10:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Feb 2019 02:52:22 +0000 (10:52 +0800)

Trivial merge