Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 10:34:47 +0000 (11:34 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 10:34:47 +0000 (11:34 +0100)

Trivial merge