Merge branch 'MDL-54742-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 06:29:55 +0000 (14:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 06:29:55 +0000 (14:29 +0800)

Trivial merge