Merge pull request #106 from apache/directoryMoves