Merge branch 'MDL-62619' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Aug 2018 00:43:43 +0000 (08:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Aug 2018 00:43:43 +0000 (08:43 +0800)

Trivial merge