Merge branch 'MDL-65328' of https://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Mon, 15 Apr 2019 11:53:15 +0000 (13:53 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 15 Apr 2019 11:53:15 +0000 (13:53 +0200)

Trivial merge