Merge branch 'MDL-64300' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Dec 2018 00:28:06 +0000 (08:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Dec 2018 00:28:06 +0000 (08:28 +0800)

Trivial merge