Merge branch 'MDL-60435_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Jul 2018 11:37:12 +0000 (13:37 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Jul 2018 11:37:12 +0000 (13:37 +0200)

Trivial merge