Merge branch 'MDL-62691-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:35:54 +0000 (15:35 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:00 +0000 (23:33 +0200)

Trivial merge