Merge branch 'MDL-64282' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 30 Nov 2018 12:02:47 +0000 (13:02 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 30 Nov 2018 12:02:47 +0000 (13:02 +0100)

Trivial merge