Merge pull request #1049 from nico/update-links