Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 6 Nov 2017 20:45:14 +0000 (21:45 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 6 Nov 2017 20:45:14 +0000 (21:45 +0100)

Trivial merge