Merge branch 'MDL-56549-master' of https://github.com/kabalin/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 17 Oct 2019 22:27:21 +0000 (06:27 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 17 Oct 2019 22:27:21 +0000 (06:27 +0800)

Trivial merge