Merge branch 'master-MDL-67524' of https://github.com/yao9394/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 23 Dec 2019 02:28:50 +0000 (10:28 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 23 Dec 2019 02:28:50 +0000 (10:28 +0800)

Trivial merge