Merge branch 'MDL-67544-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 9 Jan 2020 07:22:27 +0000 (15:22 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 9 Jan 2020 07:22:27 +0000 (15:22 +0800)

Trivial merge