Merge branch 'MDL-62218-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 May 2018 03:11:14 +0000 (11:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 May 2018 03:11:14 +0000 (11:11 +0800)

Trivial merge