Merge pull request #1133 from sipa/abspath