Merge branch 'MDL-62381_master' of https://github.com/Syxton/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 May 2018 14:34:40 +0000 (16:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 May 2018 14:34:40 +0000 (16:34 +0200)

Trivial merge