Merge branch 'MDL-63700-master' of git://github.com/mickhawkins/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Nov 2018 10:13:51 +0000 (11:13 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Nov 2018 10:13:51 +0000 (11:13 +0100)

Trivial merge