Merge branch 'MDL-60960-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 11:10:20 +0000 (12:10 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 11:10:20 +0000 (12:10 +0100)

Trivial merge