Merge branch 'MDL-63346' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Sep 2018 00:35:08 +0000 (08:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Sep 2018 00:35:08 +0000 (08:35 +0800)

Trivial merge