Merge branch 'MDL-65505-master' of https://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 May 2019 12:36:38 +0000 (20:36 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 7 May 2019 08:24:39 +0000 (16:24 +0800)

Trivial merge