Integrating merge conflict fixes
Integrating merge conflict fixes

dga711/CefSharp,windygu/CefSharp,haozhouxu/CefSharp,jamespearce2006/CefSharp,Livit/CefSharp,windygu/CefSharp,yoder/CefSharp,Haraguroicha/CefSharp,wangzheng888520/CefSharp,zhangjingpu/CefSharp,zhangjingpu/CefSharp,dga711/CefSharp,NumbersInternational/CefSharp,VioletLife/CefSharp,gregmartinhtc/CefSharp,joshvera/CefSharp,jamespearce2006/CefSharp,NumbersInternational/CefSharp,ITGlobal/CefSharp,VioletLife/CefSharp,jamespearce2006/CefSharp,illfang/CefSharp,battewr/CefSharp,AJDev77/CefSharp,AJDev77/CefSharp,wangzheng888520/CefSharp,jamespearce2006/CefSharp,dga711/CefSharp,zhangjingpu/CefSharp,Livit/CefSharp,AJDev77/CefSharp,yoder/CefSharp,twxstar/CefSharp,rlmcneary2/CefSharp,battewr/CefSharp,battewr/CefSharp,Haraguroicha/CefSharp,illfang/CefSharp,Haraguroicha/CefSharp,haozhouxu/CefSharp,illfang/CefSharp,illfang/CefSharp,Livit/CefSharp,joshvera/CefSharp,Livit/CefSharp,VioletLife/CefSharp,joshvera/CefSharp,twxstar/CefSharp,Haraguroicha/CefSharp,twxstar/CefSharp,rlmcneary2/CefSharp,twxstar/CefSharp,yoder/CefSharp,jamespearce2006/CefSharp,yoder/CefSharp,ITGlobal/CefSharp,windygu/CefSharp,ITGlobal/CefSharp,zhangjingpu/CefSharp,haozhouxu/CefSharp,dga711/CefSharp,rlmcneary2/CefSharp,wangzheng888520/CefSharp,AJDev77/CefSharp,ITGlobal/CefSharp,gregmartinhtc/CefSharp,battewr/CefSharp,joshvera/CefSharp,haozhouxu/CefSharp,gregmartinhtc/CefSharp,rlmcneary2/CefSharp,NumbersInternational/CefSharp,Haraguroicha/CefSharp,NumbersInternational/CefSharp,VioletLife/CefSharp,gregmartinhtc/CefSharp,wangzheng888520/CefSharp,windygu/CefSharp