Merge branch 'MDL-66354-master' of http://github.com/dravek/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Sep 2019 08:43:15 +0000 (16:43 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Sep 2019 08:43:15 +0000 (16:43 +0800)

Trivial merge