emaste added a comment. Just a heads-up before this gets committed: when I tried applying this locally (from Phabricator "download raw diff") it produced complaints about differing line endings. Testing with this patch now. https://reviews.llvm.org/D24336