Merge branch 'jc/diff-relative'