Merge branch 'MDL-63688-master-1' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 02:16:08 +0000 (10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 02:16:08 +0000 (10:16 +0800)

Trivial merge