Merge branch 'MDL-57741-master' of git://github.com/cescobedo/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 20 Aug 2018 02:11:49 +0000 (10:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 20 Aug 2018 02:11:49 +0000 (10:11 +0800)

Trivial merge