Merge pull request #1072 from sipa/boostpaths