Merge branch 'MDL-60528-m' of https://github.com/micaherne/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 16:58:39 +0000 (17:58 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 16:58:39 +0000 (17:58 +0100)

Trivial merge