Report relative file names on error.
Add test for relative paths
Merge branch 'rogierschouten-master'