Merge branch 'MDL-66543-master' of git://github.com/tobiasreischmann/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 24 Oct 2019 15:08:43 +0000 (23:08 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 24 Oct 2019 15:08:43 +0000 (23:08 +0800)

Trivial merge