Merge branch 'MDL-61290_master' of https://github.com/aanabit/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 15:18:17 +0000 (17:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 15:18:17 +0000 (17:18 +0200)

Trivial merge