Merge branch 'MDL-68745-master-fix' of github.com:sarjona/moodle
authorSara Arjona <sara@moodle.com>
Fri, 5 Jun 2020 20:17:59 +0000 (22:17 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 5 Jun 2020 20:17:59 +0000 (22:17 +0200)

Trivial merge