Merge branch 'MDL-61858_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 16:06:50 +0000 (18:06 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 16:06:50 +0000 (18:06 +0200)

Trivial merge