Merge branch 'MDL-62180-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 07:46:25 +0000 (15:46 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 07:46:25 +0000 (15:46 +0800)

Trivial merge