Merge branch 'MDL-59986-master' of https://github.com/danielneis/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 23 Jan 2019 08:03:26 +0000 (16:03 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 23 Jan 2019 08:03:26 +0000 (16:03 +0800)

Trivial merge