Fix Bug 1036634 - links to pages within the site should be rendered in the current locale
Merge branch 'mmmavis-fix-bug-1036634'