Merge branch 'MDL-62660' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Aug 2018 00:02:47 +0000 (08:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Aug 2018 00:02:47 +0000 (08:02 +0800)

Trivial merge