Merge branch 'MDL-61990' of https://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 14 Nov 2018 11:09:34 +0000 (12:09 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 14 Nov 2018 11:09:34 +0000 (12:09 +0100)

Trivial merge