Merge branch 'MDL-63031-master' of https://github.com/prg3/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 14 Aug 2018 04:11:25 +0000 (12:11 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 14 Aug 2018 04:11:25 +0000 (12:11 +0800)

Trivial merge