Merge branch 'MDL-65829_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 02:20:15 +0000 (10:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 02:20:15 +0000 (10:20 +0800)

Trivial merge