Merge branch 'MDL-67084-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 7 Nov 2019 11:40:55 +0000 (19:40 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 7 Nov 2019 11:40:55 +0000 (19:40 +0800)

Trivial merge