Merge branch 'MDL-66694-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 17 Oct 2019 14:48:16 +0000 (22:48 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 17 Oct 2019 14:48:16 +0000 (22:48 +0800)

Trivial merge