Merge branch 'MDL-62160-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 16:10:13 +0000 (18:10 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 16:10:13 +0000 (18:10 +0200)

Trivial merge