Merge branch 'MDL-67116-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 13 Nov 2019 07:31:03 +0000 (15:31 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 13 Nov 2019 07:31:03 +0000 (15:31 +0800)

Trivial merge