Merge branch 'MDL-66450-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 9 Oct 2019 12:40:28 +0000 (20:40 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 9 Oct 2019 12:40:28 +0000 (20:40 +0800)

Trivial merge