Merge branch 'MDL-63690-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 00:20:31 +0000 (08:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 00:20:31 +0000 (08:20 +0800)

Trivial merge