Merge branch 'master' into staging
Update legacy links
Update legacy links
Merge pull request #645 from Connexions/update-links

Update legacy links
Merge branch 'master' into staging
Merge branch 'staging' into production