Merge branch 'MDL-63293' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Wed, 18 Sep 2019 11:39:55 +0000 (13:39 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 18 Sep 2019 11:39:55 +0000 (13:39 +0200)

Trivial merge