Merge branch 'MDL-61484-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jun 2018 08:33:52 +0000 (10:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jun 2018 08:33:52 +0000 (10:33 +0200)

Trivial merge