Merge branch 'MDL-42764_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:18:34 +0000 (11:18 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:18:34 +0000 (11:18 +0100)

Trivial merge