Merge branch 'MDL-66971-master' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 23 Oct 2019 06:55:46 +0000 (14:55 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 23 Oct 2019 06:55:46 +0000 (14:55 +0800)

Trivial merge