Merge branch 'master_MDL-64124' of https://github.com/danmarsden/moodle
authorSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 08:56:47 +0000 (09:56 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 08:56:47 +0000 (09:56 +0100)

Trivial merge