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

Trivial merge