Merge pull request #3071 from adamburgess/fix-ci-links