Merge branch 'MDL-62801-master' of git://github.com/mickhawkins/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 2 Jul 2018 08:18:23 +0000 (16:18 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 2 Jul 2018 08:18:23 +0000 (16:18 +0800)

Trivial merge