Fixup rebase conflicts
Fixup rebase conflicts

apple/swift,atrick/swift,lorentey/swift,shajrawi/swift,shahmishal/swift,rudkx/swift,stephentyrone/swift,sschiau/swift,tkremenek/swift,lorentey/swift,devincoughlin/swift,practicalswift/swift,roambotics/swift,xwu/swift,lorentey/swift,stephentyrone/swift,jmgc/swift,xwu/swift,xedin/swift,benlangmuir/swift,airspeedswift/swift,xwu/swift,karwa/swift,gribozavr/swift,airspeedswift/swift,JGiola/swift,aschwaighofer/swift,amraboelela/swift,devincoughlin/swift,ahoppen/swift,harlanhaskins/swift,shahmishal/swift,stephentyrone/swift,karwa/swift,JGiola/swift,airspeedswift/swift,roambotics/swift,gregomni/swift,jckarter/swift,tkremenek/swift,gribozavr/swift,stephentyrone/swift,xedin/swift,practicalswift/swift,shajrawi/swift,sschiau/swift,shajrawi/swift,shahmishal/swift,sschiau/swift,jmgc/swift,devincoughlin/swift,gribozavr/swift,xedin/swift,harlanhaskins/swift,lorentey/swift,gribozavr/swift,sschiau/swift,airspeedswift/swift,nathawes/swift,amraboelela/swift,stephentyrone/swift,tkremenek/swift,glessard/swift,harlanhaskins/swift,tkremenek/swift,benlangmuir/swift,apple/swift,practicalswift/swift,roambotics/swift,gribozavr/swift,apple/swift,glessard/swift,parkera/swift,roambotics/swift,airspeedswift/swift,parkera/swift,karwa/swift,gribozavr/swift,ahoppen/swift,gregomni/swift,JGiola/swift,amraboelela/swift,rudkx/swift,nathawes/swift,parkera/swift,atrick/swift,glessard/swift,CodaFi/swift,ahoppen/swift,hooman/swift,nathawes/swift,rudkx/swift,karwa/swift,harlanhaskins/swift,karwa/swift,devincoughlin/swift,jckarter/swift,tkremenek/swift,practicalswift/swift,airspeedswift/swift,karwa/swift,aschwaighofer/swift,sschiau/swift,shahmishal/swift,benlangmuir/swift,shajrawi/swift,jmgc/swift,xedin/swift,hooman/swift,stephentyrone/swift,jmgc/swift,jckarter/swift,aschwaighofer/swift,hooman/swift,shajrawi/swift,harlanhaskins/swift,xedin/swift,apple/swift,atrick/swift,atrick/swift,practicalswift/swift,xwu/swift,glessard/swift,allevato/swift,rudkx/swift,gribozavr/swift,CodaFi/swift,ahoppen/swift,CodaFi/swift,glessard/swift,tkremenek/swift,xedin/swift,hooman/swift,shahmishal/swift,amraboelela/swift,lorentey/swift,aschwaighofer/swift,amraboelela/swift,xedin/swift,gribozavr/swift,shahmishal/swift,xwu/swift,devincoughlin/swift,allevato/swift,devincoughlin/swift,nathawes/swift,parkera/swift,gregomni/swift,jmgc/swift,shahmishal/swift,xwu/swift,JGiola/swift,parkera/swift,stephentyrone/swift,apple/swift,lorentey/swift,CodaFi/swift,harlanhaskins/swift,rudkx/swift,gregomni/swift,aschwaighofer/swift,allevato/swift,shajrawi/swift,parkera/swift,hooman/swift,karwa/swift,JGiola/swift,jckarter/swift,roambotics/swift,amraboelela/swift,hooman/swift,nathawes/swift,parkera/swift,hooman/swift,ahoppen/swift,rudkx/swift,aschwaighofer/swift,karwa/swift,ahoppen/swift,jmgc/swift,allevato/swift,parkera/swift,gregomni/swift,benlangmuir/swift,nathawes/swift,roambotics/swift,allevato/swift,shahmishal/swift,jckarter/swift,airspeedswift/swift,jmgc/swift,practicalswift/swift,lorentey/swift,sschiau/swift,sschiau/swift,benlangmuir/swift,benlangmuir/swift,devincoughlin/swift,CodaFi/swift,shajrawi/swift,xwu/swift,apple/swift,CodaFi/swift,CodaFi/swift,xedin/swift,lorentey/swift,shajrawi/swift,jckarter/swift,atrick/swift,allevato/swift,JGiola/swift,practicalswift/swift,sschiau/swift,devincoughlin/swift,gregomni/swift,harlanhaskins/swift,allevato/swift,nathawes/swift,amraboelela/swift,aschwaighofer/swift,glessard/swift,atrick/swift,jckarter/swift,tkremenek/swift,practicalswift/swift