exception handling for file canonicalization (see #390)
Merge remote-tracking branch 'origin/master'