Merge branch 'MDL-63755-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 25 Oct 2018 00:36:49 +0000 (08:36 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 25 Oct 2018 00:36:49 +0000 (08:36 +0800)

Trivial merge