Merge branch 'MDL-62654-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:19:18 +0000 (15:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:19:18 +0000 (15:19 +0200)

Trivial merge