tree e40bcd39652e20de29d683a34d5532d8ab04f555
parent c9e364b59cbd0430f7f80c06a1a168ff9036fdeb
parent 76ab2e5c9b2a2e3d638e217cc21622f9be54f633
author Automerger <Automerger@Swift> 1494953793 -0700
committer Automerger <Automerger@Swift> 1494953793 -0700

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