Update links on info page
Merge remote-tracking branch 'refs/remotes/origin/WorkingBranch' into gh-pages