Branch to work on filename handling without disturbing trunk.


[SVN r68345]