Merge branch 'MDL-62059-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:08:09 +0000 (10:08 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:08:09 +0000 (10:08 +0200)

Trivial merge