Merge branch 'MDL-63703-master-1' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 00:56:40 +0000 (08:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 00:56:40 +0000 (08:56 +0800)

Trivial merge