tree fcbffeeca81e522193adbe774c80d9ff1fbe23f2
parent 2155894f9160d1cb0fae904997fa7bcf6be36140
parent 000bee063ea28cbabca5569c722b82d936991396
author Automerger <Automerger@Swift> 1492981303 -0700
committer Automerger <Automerger@Swift> 1492981303 -0700

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