Merge branch 'MDL-63710-master' of https://github.com/ilya-catalyst/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 6 Dec 2018 03:34:09 +0000 (11:34 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 6 Dec 2018 03:34:09 +0000 (11:34 +0800)

Trivial merge