Merge pull request #1181 from DanielWeber/issue-1161

Allow more path components