Merge branch 'MDL-62588-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:52:15 +0000 (12:52 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:52:15 +0000 (12:52 +0200)

Trivial merge