Merge branch 'MDL-62397-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 11:14:05 +0000 (13:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 11:14:05 +0000 (13:14 +0200)

Trivial merge