Merge branch 'MDL-66156-master' of https://github.com/snake/moodle
authorSara Arjona <sara@moodle.com>
Wed, 18 Sep 2019 10:25:36 +0000 (12:25 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 18 Sep 2019 10:25:36 +0000 (12:25 +0200)

Trivial merge