Merge branch 'MDL-59650-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 May 2019 02:19:55 +0000 (10:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 May 2019 02:19:55 +0000 (10:19 +0800)

Trivial merge