Fixed issue with internal links showing as external
Merge branch 'refs/heads/master' into test