Merge branch 'MDL-60657-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 10:59:30 +0000 (11:59 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 10:59:30 +0000 (11:59 +0100)

Trivial merge