Merge branch 'MDL-62823' of https://github.com/NeillM/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 09:43:37 +0000 (11:43 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 09:43:37 +0000 (11:43 +0200)

Trivial merge