Merge branch 'MDL-45851' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Jul 2018 05:10:24 +0000 (13:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Jul 2018 05:10:24 +0000 (13:10 +0800)

Trivial merge