Merge branch 'MDL-60764' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Nov 2017 09:20:25 +0000 (10:20 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Nov 2017 09:20:25 +0000 (10:20 +0100)

Trivial merge