Merge branch 'MDL-57742_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 07:13:53 +0000 (09:13 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 07:13:53 +0000 (09:13 +0200)

Trivial merge