Merge branch 'MDL-61943-master' of git://github.com/cescobedo/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 14:43:50 +0000 (16:43 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 14:43:50 +0000 (16:43 +0200)

Trivial merge