Merge branch 'MDL-65680_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 May 2019 00:42:40 +0000 (08:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 May 2019 00:42:40 +0000 (08:42 +0800)

Trivial merge