Merge branch 'MDL-63234-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 09:32:09 +0000 (11:32 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 09:32:09 +0000 (11:32 +0200)

Trivial merge