Merge branch 'MDL-66852-master' of github.com:lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Wed, 9 Oct 2019 10:58:00 +0000 (12:58 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 9 Oct 2019 10:58:00 +0000 (12:58 +0200)

Trivial merge