Merge branch 'master' of https://github.com/kristian-94/moodle
authorSara Arjona <sara@moodle.com>
Wed, 30 Jan 2019 18:08:59 +0000 (19:08 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 30 Jan 2019 18:08:59 +0000 (19:08 +0100)

Trivial merge