Merge branch 'MDL-63682-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:01:28 +0000 (11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:01:28 +0000 (11:01 +0800)

Trivial merge