Merge branch 'MDL-53808-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:34:59 +0000 (11:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:34:59 +0000 (11:34 +0800)

Trivial merge