Merge branch 'MDL-41090_rebased' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 14:52:29 +0000 (15:52 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 14:52:29 +0000 (15:52 +0100)

Trivial merge