Merge branch 'MDL-62477' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:20:06 +0000 (09:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:20:06 +0000 (09:20 +0800)

Trivial merge