Merge branch 'MDL-66108' of https://github.com/paulholden/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 Jan 2020 01:51:24 +0000 (09:51 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 21 Jan 2020 01:51:24 +0000 (09:51 +0800)

Trivial merge