Merge branch 'MDL-63431-master' of https://github.com/kabalin/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Oct 2018 07:13:53 +0000 (09:13 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Oct 2018 07:13:53 +0000 (09:13 +0200)

Trivial merge