Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 11:04:07 +0000 (12:04 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 11:04:07 +0000 (12:04 +0100)

Trivial merge