Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 06:46:32 +0000 (08:46 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 06:46:32 +0000 (08:46 +0200)

Trivial merge