Merge branch 'MDL-66796-master-fix' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 14 Oct 2019 05:48:34 +0000 (13:48 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 14 Oct 2019 05:48:34 +0000 (13:48 +0800)

Trivial merge