Merge branch 'master' of https://github.com/CengageEng/moodle
authorDavid Monllaó <davidm@moodle.com>
Tue, 12 Feb 2019 11:33:23 +0000 (12:33 +0100)
committerDavid Monllaó <davidm@moodle.com>
Tue, 12 Feb 2019 11:33:23 +0000 (12:33 +0100)

Trivial merge