Merge pull request #1140 from bukatlib/fix_relpath