Merge pull request #43 from jhermann/fix-direct-local-symlink

Fix "local" symlink in cases where it points directly to its containing directory
Merge remote-tracking branch 'upstream/master'