Merge branch 'MDL-61022-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:21:26 +0000 (10:21 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:21:26 +0000 (10:21 +0100)

Trivial merge