Merge branch 'MDL-62656-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 14:57:36 +0000 (16:57 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:01 +0000 (23:33 +0200)

Trivial merge