Merge branch 'MDL-64931_master' of git://github.com/markn86/moodle
authorSara Arjona <sara@moodle.com>
Mon, 25 Feb 2019 16:19:02 +0000 (17:19 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 25 Feb 2019 16:19:02 +0000 (17:19 +0100)

Trivial merge