Merge branch 'MDL-60574_39' of https://github.com/t-schroeder/moodle into MOODLE_39_S...
authorJun Pataleta <jun@moodle.com>
Tue, 4 Aug 2020 11:51:20 +0000 (19:51 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Aug 2020 11:51:20 +0000 (19:51 +0800)

Trivial merge