tree 7b81915bf044abb8f129172dc95b71a4ccf9f3b3
parent 5351f5c77a0295301f1c7b182ffb0124ddfedfd3
parent ee02028a97bfbce4d63787dd05366fafdda445c5
author Automerger <Automerger@Swift> 1486584034 -0800
committer Automerger <Automerger@Swift> 1486584034 -0800

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