Branch to work on filename handling without disturbing trunk.


[SVN r68345]
Fix invalid path.

[SVN r69889]