Merge pull request #1459 from akoeplinger/fix-website-links