Merge branch 'MDL-67626_master' of git://github.com/adpe/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 29 Jan 2020 13:36:12 +0000 (21:36 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 29 Jan 2020 13:36:12 +0000 (21:36 +0800)

Trivial merge