Merge branch 'MDL-62078-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 10:05:46 +0000 (12:05 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 10:05:46 +0000 (12:05 +0200)

Trivial merge