Merge branch 'MDL-61027-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:56:18 +0000 (11:56 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:56:18 +0000 (11:56 +0100)

Trivial merge