Merge branch 'MDL-63147-master' of git://github.com/peterRd/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 12 Dec 2018 00:25:02 +0000 (08:25 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 12 Dec 2018 00:25:02 +0000 (08:25 +0800)

Trivial merge