Merge branch 'MDL-61351_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 10:31:41 +0000 (12:31 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:45 +0000 (08:46 +0800)

Trivial merge