Merge branch 'MDL-62368_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 15:59:20 +0000 (17:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 15:59:20 +0000 (17:59 +0200)

Trivial merge