Merged. Relevant commits: * r292566 - Merge r292564 * r292565 - Merge r292560 /Eric -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170119/41e64f49/attachment.html>