Merge branch 'MDL-62868-master' of https://github.com/snake/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 08:20:17 +0000 (10:20 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:44 +0000 (08:46 +0800)

Trivial merge