Merge branch 'MDL-63620-master' of git://github.com/junpataleta/moodle
authorSara Arjona <sara@moodle.com>
Wed, 16 Jan 2019 13:15:10 +0000 (14:15 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 16 Jan 2019 13:15:10 +0000 (14:15 +0100)

Trivial merge