tree 78c2b91e85c4fc19ea3a95bb9e89494db1c6c368
parent db7d8d26a585aacc0a77b230d7f3887dbe873dbf
parent cc3bc9c7d68164e159e7c5d63055cfc59b45db06
author Automerger <Automerger@Swift> 1487709878 -0800
committer Automerger <Automerger@Swift> 1487709878 -0800

Propagating prior merge from 'llvm.org/release_40'.