Merge branch 'MDL-62139-master-fix3' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Oct 2018 09:16:47 +0000 (11:16 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Oct 2018 09:16:47 +0000 (11:16 +0200)

Trivial merge