Fix merge conflict.
Fix merge conflict.

robinsedlaczek/roslyn,mattscheffer/roslyn,bartdesmet/roslyn,mmitche/roslyn,kelltrick/roslyn,mmitche/roslyn,agocke/roslyn,wvdd007/roslyn,ErikSchierboom/roslyn,bkoelman/roslyn,kelltrick/roslyn,pdelvo/roslyn,jcouv/roslyn,reaction1989/roslyn,heejaechang/roslyn,dotnet/roslyn,Giftednewt/roslyn,xasx/roslyn,VSadov/roslyn,MattWindsor91/roslyn,tvand7093/roslyn,abock/roslyn,dotnet/roslyn,dpoeschl/roslyn,paulvanbrenk/roslyn,AdamSpeight2008/roslyn-AdamSpeight2008,weltkante/roslyn,TyOverby/roslyn,jkotas/roslyn,OmarTawfik/roslyn,CaptainHayashi/roslyn,genlu/roslyn,AnthonyDGreen/roslyn,xasx/roslyn,khyperia/roslyn,tmat/roslyn,genlu/roslyn,cston/roslyn,OmarTawfik/roslyn,jasonmalinowski/roslyn,pdelvo/roslyn,TyOverby/roslyn,VSadov/roslyn,AnthonyDGreen/roslyn,srivatsn/roslyn,KirillOsenkov/roslyn,bartdesmet/roslyn,davkean/roslyn,reaction1989/roslyn,aelij/roslyn,tmeschter/roslyn,orthoxerox/roslyn,MattWindsor91/roslyn,dpoeschl/roslyn,tmat/roslyn,ErikSchierboom/roslyn,KevinRansom/roslyn,lorcanmooney/roslyn,stephentoub/roslyn,AdamSpeight2008/roslyn-AdamSpeight2008,DustinCampbell/roslyn,Giftednewt/roslyn,jamesqo/roslyn,Giftednewt/roslyn,AlekseyTs/roslyn,khyperia/roslyn,tannergooding/roslyn,AlekseyTs/roslyn,bkoelman/roslyn,diryboy/roslyn,jmarolf/roslyn,TyOverby/roslyn,srivatsn/roslyn,kelltrick/roslyn,AlekseyTs/roslyn,brettfo/roslyn,khyperia/roslyn,MichalStrehovsky/roslyn,jmarolf/roslyn,panopticoncentral/roslyn,sharwell/roslyn,Hosch250/roslyn,tannergooding/roslyn,CyrusNajmabadi/roslyn,sharwell/roslyn,shyamnamboodiripad/roslyn,diryboy/roslyn,mavasani/roslyn,physhi/roslyn,tvand7093/roslyn,robinsedlaczek/roslyn,heejaechang/roslyn,agocke/roslyn,shyamnamboodiripad/roslyn,swaroop-sridhar/roslyn,mgoertz-msft/roslyn,jamesqo/roslyn,gafter/roslyn,ErikSchierboom/roslyn,davkean/roslyn,DustinCampbell/roslyn,gafter/roslyn,MattWindsor91/roslyn,wvdd007/roslyn,jcouv/roslyn,CaptainHayashi/roslyn,jamesqo/roslyn,KevinRansom/roslyn,KevinRansom/roslyn,AdamSpeight2008/roslyn-AdamSpeight2008,Hosch250/roslyn,shyamnamboodiripad/roslyn,DustinCampbell/roslyn,nguerrera/roslyn,dotnet/roslyn,cston/roslyn,cston/roslyn,AnthonyDGreen/roslyn,MichalStrehovsky/roslyn,tannergooding/roslyn,orthoxerox/roslyn,paulvanbrenk/roslyn,mavasani/roslyn,paulvanbrenk/roslyn,abock/roslyn,orthoxerox/roslyn,xasx/roslyn,CyrusNajmabadi/roslyn,AmadeusW/roslyn,panopticoncentral/roslyn,Hosch250/roslyn,jasonmalinowski/roslyn,MattWindsor91/roslyn,bkoelman/roslyn,davkean/roslyn,stephentoub/roslyn,dpoeschl/roslyn,panopticoncentral/roslyn,pdelvo/roslyn,jkotas/roslyn,KirillOsenkov/roslyn,tmeschter/roslyn,mgoertz-msft/roslyn,jmarolf/roslyn,MichalStrehovsky/roslyn,tvand7093/roslyn,CaptainHayashi/roslyn,AmadeusW/roslyn,physhi/roslyn,weltkante/roslyn,genlu/roslyn,diryboy/roslyn,jkotas/roslyn,aelij/roslyn,KirillOsenkov/roslyn,stephentoub/roslyn,eriawan/roslyn,mgoertz-msft/roslyn,sharwell/roslyn,brettfo/roslyn,aelij/roslyn,wvdd007/roslyn,jcouv/roslyn,eriawan/roslyn,srivatsn/roslyn,swaroop-sridhar/roslyn,gafter/roslyn,brettfo/roslyn,reaction1989/roslyn,mmitche/roslyn,AmadeusW/roslyn,mattscheffer/roslyn,weltkante/roslyn,bartdesmet/roslyn,OmarTawfik/roslyn,mavasani/roslyn,robinsedlaczek/roslyn,VSadov/roslyn,agocke/roslyn,nguerrera/roslyn,lorcanmooney/roslyn,CyrusNajmabadi/roslyn,tmat/roslyn,jasonmalinowski/roslyn,heejaechang/roslyn,lorcanmooney/roslyn,physhi/roslyn,mattscheffer/roslyn,tmeschter/roslyn,nguerrera/roslyn,abock/roslyn,swaroop-sridhar/roslyn,eriawan/roslyn