Branch to work on filename handling without disturbing trunk.