Merge branch 'MDL-63276' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Jan 2019 22:55:37 +0000 (06:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Jan 2019 22:55:37 +0000 (06:55 +0800)

Trivial merge