Merge branch 'MDL-61359-master' of git://github.com/mickhawkins/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 04:10:33 +0000 (12:10 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 04:10:33 +0000 (12:10 +0800)

Trivial merge