Merge branch 'MDL-62756_master' of https://github.com/miotto/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 17 Dec 2018 03:20:01 +0000 (11:20 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 17 Dec 2018 03:20:01 +0000 (11:20 +0800)

Trivial merge