t.p.northover accepted this revision. t.p.northover added a comment. This revision is now accepted and ready to land. Other than that, I think this is reasonable. I don't think you need to upload a corrected version before committing. Tim. https://reviews.llvm.org/D22640