Merge branch 'MDL-57256-master-legacylink' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Dec 2016 15:45:31 +0000 (15:45 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Dec 2016 15:45:31 +0000 (15:45 +0000)

Trivial merge