Merge branch 'MDL-61296-master' of git://github.com/cescobedo/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 15:16:05 +0000 (17:16 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:02 +0000 (23:33 +0200)

Trivial merge