Merge branch 'MDL-57727-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 11:33:40 +0000 (12:33 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 11:33:40 +0000 (12:33 +0100)

Trivial merge