Merge branch 'MDL-64615-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Mon, 25 Mar 2019 17:20:01 +0000 (18:20 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 25 Mar 2019 17:20:01 +0000 (18:20 +0100)

Trivial merge