Merge branch 'MDL-65952' of https://github.com/fabiendallet/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 23 Jan 2020 02:45:19 +0000 (10:45 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Jan 2020 07:11:02 +0000 (15:11 +0800)

Trivial merge