Merge branch 'MDL-63686-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 8 Jan 2019 06:37:31 +0000 (14:37 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 8 Jan 2019 06:37:31 +0000 (14:37 +0800)

Trivial merge