Fixes to sync up with Apple master.
Fixes to sync up with Apple master.

Swift SVN r12979

glessard/swift,emilstahl/swift,ahoppen/swift,gregomni/swift,roambotics/swift,OscarSwanros/swift,zisko/swift,ken0nek/swift,harlanhaskins/swift,CodaFi/swift,jtbandes/swift,lorentey/swift,felix91gr/swift,hooman/swift,codestergit/swift,glessard/swift,rudkx/swift,JGiola/swift,hooman/swift,shajrawi/swift,hooman/swift,natecook1000/swift,KrishMunot/swift,parkera/swift,aschwaighofer/swift,tkremenek/swift,shajrawi/swift,bitjammer/swift,roambotics/swift,deyton/swift,xedin/swift,modocache/swift,calebd/swift,brentdax/swift,amraboelela/swift,jckarter/swift,shajrawi/swift,arvedviehweger/swift,jmgc/swift,OscarSwanros/swift,shahmishal/swift,LeoShimonaka/swift,brentdax/swift,devincoughlin/swift,glessard/swift,dduan/swift,tinysun212/swift-windows,kusl/swift,gregomni/swift,karwa/swift,apple/swift,jmgc/swift,dreamsxin/swift,swiftix/swift,frootloops/swift,slavapestov/swift,tjw/swift,swiftix/swift,kusl/swift,frootloops/swift,Ivacker/swift,huonw/swift,atrick/swift,frootloops/swift,bitjammer/swift,emilstahl/swift,amraboelela/swift,nathawes/swift,slavapestov/swift,djwbrown/swift,dduan/swift,return/swift,return/swift,emilstahl/swift,gribozavr/swift,adrfer/swift,arvedviehweger/swift,JaSpa/swift,roambotics/swift,frootloops/swift,cbrentharris/swift,kstaring/swift,brentdax/swift,khizkhiz/swift,gribozavr/swift,kentya6/swift,tardieu/swift,khizkhiz/swift,parkera/swift,jtbandes/swift,therealbnut/swift,manavgabhawala/swift,alblue/swift,karwa/swift,LeoShimonaka/swift,tinysun212/swift-windows,calebd/swift,brentdax/swift,kperryua/swift,brentdax/swift,devincoughlin/swift,benlangmuir/swift,deyton/swift,tinysun212/swift-windows,LeoShimonaka/swift,codestergit/swift,mightydeveloper/swift,natecook1000/swift,harlanhaskins/swift,allevato/swift,austinzheng/swift,nathawes/swift,modocache/swift,danielmartin/swift,natecook1000/swift,jmgc/swift,parkera/swift,khizkhiz/swift,shajrawi/swift,calebd/swift,jtbandes/swift,kperryua/swift,sdulal/swift,khizkhiz/swift,jopamer/swift,ben-ng/swift,therealbnut/swift,cbrentharris/swift,tjw/swift,tjw/swift,atrick/swift,danielmartin/swift,sschiau/swift,hooman/swift,JaSpa/swift,alblue/swift,khizkhiz/swift,sdulal/swift,adrfer/swift,rudkx/swift,gribozavr/swift,benlangmuir/swift,jtbandes/swift,gregomni/swift,swiftix/swift.old,gmilos/swift,amraboelela/swift,alblue/swift,manavgabhawala/swift,MukeshKumarS/Swift,frootloops/swift,sdulal/swift,djwbrown/swift,karwa/swift,devincoughlin/swift,ken0nek/swift,ben-ng/swift,swiftix/swift.old,gribozavr/swift,kstaring/swift,danielmartin/swift,russbishop/swift,xwu/swift,uasys/swift,parkera/swift,milseman/swift,SwiftAndroid/swift,kentya6/swift,xwu/swift,austinzheng/swift,aschwaighofer/swift,sschiau/swift,jtbandes/swift,mightydeveloper/swift,CodaFi/swift,felix91gr/swift,uasys/swift,apple/swift,mightydeveloper/swift,sdulal/swift,dduan/swift,alblue/swift,johnno1962d/swift,tkremenek/swift,zisko/swift,Ivacker/swift,MukeshKumarS/Swift,OscarSwanros/swift,MukeshKumarS/Swift,uasys/swift,kstaring/swift,harlanhaskins/swift,amraboelela/swift,sschiau/swift,xwu/swift,austinzheng/swift,kusl/swift,practicalswift/swift,adrfer/swift,calebd/swift,deyton/swift,johnno1962d/swift,tkremenek/swift,milseman/swift,sdulal/swift,apple/swift,khizkhiz/swift,xedin/swift,kperryua/swift,amraboelela/swift,cbrentharris/swift,kusl/swift,ken0nek/swift,hughbe/swift,modocache/swift,felix91gr/swift,airspeedswift/swift,huonw/swift,Ivacker/swift,Jnosh/swift,tardieu/swift,ken0nek/swift,ben-ng/swift,LeoShimonaka/swift,huonw/swift,gmilos/swift,gmilos/swift,apple/swift,ben-ng/swift,shahmishal/swift,aschwaighofer/swift,gottesmm/swift,manavgabhawala/swift,IngmarStein/swift,jmgc/swift,hughbe/swift,Jnosh/swift,cbrentharris/swift,rudkx/swift,therealbnut/swift,Ivacker/swift,russbishop/swift,amraboelela/swift,russbishop/swift,lorentey/swift,sschiau/swift,adrfer/swift,SwiftAndroid/swift,kstaring/swift,xedin/swift,harlanhaskins/swift,gottesmm/swift,huonw/swift,karwa/swift,kusl/swift,slavapestov/swift,practicalswift/swift,zisko/swift,gribozavr/swift,parkera/swift,allevato/swift,shahmishal/swift,LeoShimonaka/swift,tardieu/swift,roambotics/swift,JaSpa/swift,nathawes/swift,IngmarStein/swift,cbrentharris/swift,practicalswift/swift,hooman/swift,jmgc/swift,kusl/swift,emilstahl/swift,JGiola/swift,emilstahl/swift,MukeshKumarS/Swift,therealbnut/swift,KrishMunot/swift,airspeedswift/swift,gottesmm/swift,ken0nek/swift,shahmishal/swift,glessard/swift,KrishMunot/swift,swiftix/swift.old,milseman/swift,SwiftAndroid/swift,jckarter/swift,alblue/swift,benlangmuir/swift,Jnosh/swift,russbishop/swift,IngmarStein/swift,gmilos/swift,codestergit/swift,zisko/swift,stephentyrone/swift,Ivacker/swift,danielmartin/swift,KrishMunot/swift,LeoShimonaka/swift,swiftix/swift.old,aschwaighofer/swift,return/swift,nathawes/swift,dreamsxin/swift,CodaFi/swift,KrishMunot/swift,jtbandes/swift,gribozavr/swift,felix91gr/swift,JaSpa/swift,CodaFi/swift,deyton/swift,shajrawi/swift,arvedviehweger/swift,mightydeveloper/swift,Jnosh/swift,aschwaighofer/swift,stephentyrone/swift,gregomni/swift,nathawes/swift,danielmartin/swift,CodaFi/swift,jmgc/swift,xwu/swift,Ivacker/swift,deyton/swift,harlanhaskins/swift,alblue/swift,roambotics/swift,KrishMunot/swift,practicalswift/swift,cbrentharris/swift,lorentey/swift,devincoughlin/swift,danielmartin/swift,austinzheng/swift,felix91gr/swift,djwbrown/swift,tjw/swift,roambotics/swift,bitjammer/swift,milseman/swift,natecook1000/swift,kentya6/swift,djwbrown/swift,glessard/swift,zisko/swift,dduan/swift,IngmarStein/swift,LeoShimonaka/swift,OscarSwanros/swift,sschiau/swift,lorentey/swift,lorentey/swift,felix91gr/swift,shahmishal/swift,apple/swift,codestergit/swift,kusl/swift,lorentey/swift,swiftix/swift.old,stephentyrone/swift,xedin/swift,manavgabhawala/swift,sdulal/swift,JGiola/swift,modocache/swift,swiftix/swift,kentya6/swift,MukeshKumarS/Swift,airspeedswift/swift,shajrawi/swift,nathawes/swift,hooman/swift,benlangmuir/swift,IngmarStein/swift,ahoppen/swift,cbrentharris/swift,tjw/swift,jopamer/swift,ben-ng/swift,uasys/swift,rudkx/swift,OscarSwanros/swift,manavgabhawala/swift,jtbandes/swift,MukeshKumarS/Swift,xwu/swift,sdulal/swift,JGiola/swift,ahoppen/swift,kperryua/swift,glessard/swift,jckarter/swift,johnno1962d/swift,modocache/swift,return/swift,hughbe/swift,slavapestov/swift,devincoughlin/swift,mightydeveloper/swift,austinzheng/swift,manavgabhawala/swift,jopamer/swift,parkera/swift,swiftix/swift,karwa/swift,shahmishal/swift,tinysun212/swift-windows,danielmartin/swift,russbishop/swift,mightydeveloper/swift,allevato/swift,return/swift,gregomni/swift,sschiau/swift,tkremenek/swift,karwa/swift,karwa/swift,practicalswift/swift,xedin/swift,shahmishal/swift,kentya6/swift,brentdax/swift,SwiftAndroid/swift,xwu/swift,Jnosh/swift,ahoppen/swift,gottesmm/swift,jckarter/swift,IngmarStein/swift,kentya6/swift,swiftix/swift,airspeedswift/swift,codestergit/swift,manavgabhawala/swift,mightydeveloper/swift,tinysun212/swift-windows,zisko/swift,huonw/swift,devincoughlin/swift,calebd/swift,uasys/swift,calebd/swift,airspeedswift/swift,apple/swift,cbrentharris/swift,russbishop/swift,tkremenek/swift,hooman/swift,airspeedswift/swift,kstaring/swift,SwiftAndroid/swift,adrfer/swift,djwbrown/swift,practicalswift/swift,hughbe/swift,johnno1962d/swift,ben-ng/swift,modocache/swift,gottesmm/swift,benlangmuir/swift,IngmarStein/swift,return/swift,therealbnut/swift,tardieu/swift,devincoughlin/swift,MukeshKumarS/Swift,LeoShimonaka/swift,tinysun212/swift-windows,alblue/swift,rudkx/swift,natecook1000/swift,zisko/swift,xedin/swift,xedin/swift,SwiftAndroid/swift,stephentyrone/swift,practicalswift/swift,Jnosh/swift,uasys/swift,amraboelela/swift,gregomni/swift,JaSpa/swift,Ivacker/swift,aschwaighofer/swift,huonw/swift,sschiau/swift,tardieu/swift,kperryua/swift,arvedviehweger/swift,gmilos/swift,arvedviehweger/swift,tkremenek/swift,slavapestov/swift,parkera/swift,harlanhaskins/swift,bitjammer/swift,lorentey/swift,kperryua/swift,felix91gr/swift,sschiau/swift,SwiftAndroid/swift,airspeedswift/swift,deyton/swift,ken0nek/swift,allevato/swift,frootloops/swift,ben-ng/swift,JGiola/swift,hughbe/swift,swiftix/swift.old,Ivacker/swift,ahoppen/swift,djwbrown/swift,practicalswift/swift,emilstahl/swift,mightydeveloper/swift,milseman/swift,gottesmm/swift,kperryua/swift,parkera/swift,stephentyrone/swift,jckarter/swift,huonw/swift,shajrawi/swift,hughbe/swift,tjw/swift,gottesmm/swift,swiftix/swift,jopamer/swift,kstaring/swift,aschwaighofer/swift,swiftix/swift,arvedviehweger/swift,frootloops/swift,shahmishal/swift,gribozavr/swift,rudkx/swift,brentdax/swift,allevato/swift,jmgc/swift,tkremenek/swift,adrfer/swift,jopamer/swift,Jnosh/swift,bitjammer/swift,atrick/swift,slavapestov/swift,shajrawi/swift,codestergit/swift,allevato/swift,emilstahl/swift,harlanhaskins/swift,djwbrown/swift,devincoughlin/swift,austinzheng/swift,JaSpa/swift,uasys/swift,johnno1962d/swift,milseman/swift,johnno1962d/swift,return/swift,CodaFi/swift,JGiola/swift,dduan/swift,allevato/swift,swiftix/swift.old,gmilos/swift,kentya6/swift,tjw/swift,tinysun212/swift-windows,emilstahl/swift,benlangmuir/swift,jopamer/swift,kstaring/swift,tardieu/swift,atrick/swift,kusl/swift,atrick/swift,deyton/swift,karwa/swift,slavapestov/swift,JaSpa/swift,jopamer/swift,natecook1000/swift,calebd/swift,arvedviehweger/swift,CodaFi/swift,bitjammer/swift,therealbnut/swift,modocache/swift,adrfer/swift,ken0nek/swift,russbishop/swift,stephentyrone/swift,austinzheng/swift,KrishMunot/swift,gribozavr/swift,bitjammer/swift,xedin/swift,dduan/swift,OscarSwanros/swift,xwu/swift,codestergit/swift,khizkhiz/swift,ahoppen/swift,dduan/swift,jckarter/swift,stephentyrone/swift,OscarSwanros/swift,kentya6/swift,natecook1000/swift,lorentey/swift,gmilos/swift,atrick/swift,milseman/swift,tardieu/swift,jckarter/swift,hughbe/swift,swiftix/swift.old,sdulal/swift,johnno1962d/swift,therealbnut/swift,nathawes/swift