Merge branch 'MDL-65661-master' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Wed, 22 May 2019 12:57:39 +0000 (14:57 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 22 May 2019 12:57:39 +0000 (14:57 +0200)

Trivial merge