Merge branch 'master_MDL-58015' of https://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 11:36:21 +0000 (13:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 11:36:21 +0000 (13:36 +0200)

Trivial merge