Merge branch 'MDL-61169-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Jan 2018 13:58:31 +0000 (14:58 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Jan 2018 13:58:31 +0000 (14:58 +0100)

Trivial merge