Merge branch 'MDL-68737_master' of https://github.com/t-schroeder/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 Jul 2020 13:55:41 +0000 (21:55 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 21 Jul 2020 13:55:41 +0000 (21:55 +0800)

Trivial merge