Merge "fix more broken links" into jb-dev