Merge branch 'MDL-63655' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 06:53:18 +0000 (14:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 06:53:18 +0000 (14:53 +0800)

Trivial merge