Merge branch 'MDL-63238-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 08:36:16 +0000 (10:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 08:36:16 +0000 (10:36 +0200)

Trivial merge