Corrected a couple of broken links
Merge branch 'v3.0'