Broken links fix
Merge branch 'qf-brokenlinks'