Merge branch 'MDL-61986-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 14:26:03 +0000 (16:26 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 14:26:03 +0000 (16:26 +0200)

Trivial merge