Merge branch 'MDL-62326-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 May 2018 10:09:40 +0000 (12:09 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 May 2018 10:09:40 +0000 (12:09 +0200)

Trivial merge