Merge branch 'MDL-33509-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 05:52:31 +0000 (13:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 05:52:31 +0000 (13:52 +0800)

Trivial merge