Merge branch 'MDL-62753' of https://github.com/OdyX/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 13:15:40 +0000 (15:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 13:15:40 +0000 (15:15 +0200)

Trivial merge