Merge branch 'MDL-58634-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 12:36:01 +0000 (14:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 12:36:01 +0000 (14:36 +0200)

Trivial merge