Merge branch 'MDL-62291-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 May 2018 04:12:00 +0000 (06:12 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 May 2018 04:12:00 +0000 (06:12 +0200)

Trivial merge