Merge branch 'MDL-66009-master' of https://github.com/grabs/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 21 Oct 2019 08:15:20 +0000 (16:15 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 21 Oct 2019 08:15:20 +0000 (16:15 +0800)

Trivial merge