Merge branch 'MDL-62010-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 00:12:27 +0000 (08:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 00:12:27 +0000 (08:12 +0800)

Trivial merge