Merge branch 'MDL-62516-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 May 2018 09:15:02 +0000 (11:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 May 2018 09:15:02 +0000 (11:15 +0200)

Trivial merge