Merge branch 'MDL-64357_master' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 11 Dec 2018 09:43:59 +0000 (17:43 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 11 Dec 2018 09:43:59 +0000 (17:43 +0800)

Trivial merge