Merge branch 'MDL-64166-master' of https://github.com/ryanwyllie/moodle
authorSara Arjona <sara@moodle.com>
Wed, 16 Jan 2019 07:48:29 +0000 (08:48 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 16 Jan 2019 07:48:29 +0000 (08:48 +0100)

Trivial merge