Should ignore missing files.
Ignore all 29MB of xml we were trying to upload.
Merge commit '90a0f52e6d012219561258c68611e292c507613e' into emma-merge
Merge commit '7e31fee76e49733beb6a662951d3f6b0fa8caebe' into emma-merge