Collect complete directory tree before beginning conversion
Merge commit '53f2b78'