Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 9 Nov 2017 07:48:48 +0000 (08:48 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 9 Nov 2017 07:48:48 +0000 (08:48 +0100)

Trivial merge