Merge branch 'MDL-47247-master' of git://github.com/mihailges/moodle
authorSara Arjona <sara@moodle.com>
Wed, 30 Jan 2019 13:02:48 +0000 (14:02 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 30 Jan 2019 13:02:48 +0000 (14:02 +0100)

Trivial merge