Merge branch 'MDL-63210_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 09:46:27 +0000 (11:46 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 09:46:27 +0000 (11:46 +0200)

Trivial merge