Merge branch 'MDL-63619-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 24 Oct 2018 07:48:16 +0000 (09:48 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 24 Oct 2018 07:48:16 +0000 (09:48 +0200)

Trivial merge