Merge branch 'MDL-35977-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 07:30:51 +0000 (15:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 07:30:51 +0000 (15:30 +0800)

Trivial merge