Merge branch 'MDL-62532-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 May 2018 08:20:02 +0000 (10:20 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 May 2018 08:20:02 +0000 (10:20 +0200)

Trivial merge