Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jun 2018 08:07:35 +0000 (10:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jun 2018 08:07:35 +0000 (10:07 +0200)

Trivial merge