Merge branch 'MDL-53972-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 12:04:42 +0000 (14:04 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:48 +0000 (08:46 +0800)

Trivial merge