Use merge method for computing relative links
Merge branch 'kanety-convert'