Merge pull request #804 from jmarshallnz/i_dont_like_paths