Merge branch 'MDL-62024-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Apr 2018 09:34:00 +0000 (11:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Apr 2018 09:34:00 +0000 (11:34 +0200)

Trivial merge