Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 08:56:12 +0000 (08:56 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 08:56:12 +0000 (08:56 +0000)

Trivial merge