Merge branch 'MDL-61819-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 14:12:59 +0000 (16:12 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 14:12:59 +0000 (16:12 +0200)

Trivial merge