Merge branch 'MDL-63101-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 28 Aug 2018 08:55:07 +0000 (16:55 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 28 Aug 2018 08:55:07 +0000 (16:55 +0800)

Trivial merge