Merge branch 'MDL-61375_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:40:31 +0000 (09:40 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:40:31 +0000 (09:40 +0100)

Trivial merge