Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 14:56:25 +0000 (15:56 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 14:56:25 +0000 (15:56 +0100)

Trivial merge