Merge branch 'MDL-64642-master' of https://github.com/albertgasset/moodle
authorSara Arjona <sara@moodle.com>
Tue, 26 Mar 2019 18:36:21 +0000 (19:36 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 26 Mar 2019 18:36:21 +0000 (19:36 +0100)

Trivial merge