Merge branch 'MDL-61153-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 09:55:28 +0000 (10:55 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 09:55:28 +0000 (10:55 +0100)

Trivial merge