Merge "Update links for software homepages"