Merge branch 'MDL-61251-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:50:39 +0000 (11:50 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:50:39 +0000 (11:50 +0100)

Trivial merge