Merge branch 'MDL-38301-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 10:44:50 +0000 (12:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 10:44:50 +0000 (12:44 +0200)

Trivial merge