Merge branch 'mh/abspath'