tree ec42ba248acd3df7b381854bc615e9c0d9f7e240
parent 98b37f211c501908f99522d677119965f66bf0dc
parent 855d4c102556800c64315ebf0f7e6339e58b6ccd
author Automerger <Automerger@Swift> 1486067032 -0800
committer Automerger <Automerger@Swift> 1486067032 -0800

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