Merge branch 'MDL-53024-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Aug 2018 07:45:57 +0000 (15:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Aug 2018 07:45:57 +0000 (15:45 +0800)

Trivial merge