Merge branch 'MDL-63528-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Oct 2018 10:18:02 +0000 (11:18 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Oct 2018 10:18:02 +0000 (11:18 +0100)

Trivial merge