Merge branch 'MDL-68367-master-fix' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 22 May 2020 07:10:04 +0000 (15:10 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 22 May 2020 07:10:04 +0000 (15:10 +0800)

Trivial merge