am 0d9d5831: Merge "fix more broken links" into jb-dev

* commit '0d9d583103aca82b6bc0be719b3579ee83760209':
  fix more broken links