Merge branch 'MDL-61198-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 16:23:59 +0000 (18:23 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 16:23:59 +0000 (18:23 +0200)

Trivial merge