Fixes 3168635 (doesn't handle inability to create output files).
Authored by: simonjwright 2011-03-17
Parent: [r84]
Child: [r86]
