Merge branch 'MDL-67921-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 26 Feb 2020 08:51:19 +0000 (16:51 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 26 Feb 2020 08:51:19 +0000 (16:51 +0800)

Trivial merge