fix 1-1-stable merge (for 1.1.rc.8)
fix 1-1-stable merge (for 1.1.rc.8)

tgxworld/bundler,AiyionPrime/bundler,dilumnavanjana/bundler,ngpestelos/bundler,danimashu/bundler,JuanitoFatas/bundler,mpapis/bundler,neslom/bundler,jingweno/bundler,pjump/bundler,patvice/bundler,byroot/bundler,chulkilee/bundler,haonature888/bundler,joshsoftware/bundler,elovelan/bundler,ximus/bundler,mattbrictson/bundler-1,bundler/bundler,RochesterinNYC/bundler,carpodaster/bundler,bronzdoc/bundler,roseweixel/bundler,robinboening/bundler,eagletmt/bundler,ximus/bundler,bundler/bundler,Elffers/bundler,neslom/bundler,Wirachmat/bundler,steved/bundler,asutoshpalai/bundler,davydovanton/bundler,PG-kura/bundler,suhastech/bundler,gentoo/bundler,smlance/bundler,mdorrance/bundler,danimashu/bundler,nju520/bundler,e2/bundler,seanlinsley/bundler,asymmetric/bundler,EthanK28/bundler,suhastech/bundler,RochesterinNYC/bundler,cstrahan/bundler,cdwort/bundler,pjump/bundler,r7kamura/bundler,jingweno/bundler,carpodaster/bundler,wenderjean/bundler,asutoshpalai/bundler,twcctz500000/bundler,cstrahan/bundler,PG-kura/bundler,schaary/bundler,mvz/bundler,patvice/bundler,philnash/bundler,wenderjean/bundler,EthanK28/bundler,joshsoftware/bundler,Teino1978-Corp/Teino1978-Corp-bundler,gregkare/bundler,jasonkarns/bundler,h4ck3rm1k3/bundler,ligi/bundler,masarakki/bundler,frsyuki/bundler,seanlinsley/bundler,pivotal-cf-experimental/bundler,Eric-Guo/bundler,vemmaverve/bundler,1337807/bundler,jaym/bundler,mvz/bundler,mattbrictson/bundler-1,AiyionPrime/bundler,kohgpat/bundler,lmtim/bundler,CorainChicago/bundler,EasonYi/bundler,smlance/bundler,anil826/bundler,EasonYi/bundler,gregkare/bundler,robinboening/bundler,pivotal-cf-experimental/bundler,christer155/bundler,kohgpat/bundler,CorainChicago/bundler,sideci-sample/sideci-sample-bundler,ipmobiletech/bundler,christer155/bundler,tgxworld/bundler,asymmetric/bundler,haonaturel/bundler,nju520/bundler,zhangkuaiji/bundler,frsyuki/bundler,h4ck3rm1k3/bundler,bronzdoc/bundler,elovelan/bundler,mpapis/bundler,simplybusiness/bundler,ipmobiletech/bundler,agis-/bundler,Eric-Guo/bundler,mdorrance/bundler,Teino1978-Corp/Teino1978-Corp-bundler,byroot/bundler,rkh/bundler,simplybusiness/bundler,cdwort/bundler,philnash/bundler,zhangkuaiji/bundler,Wirachmat/bundler,haonature/bundler,dilumnavanjana/bundler,ngpestelos/bundler,jaym/bundler,sideci-sample/sideci-sample-bundler,anil826/bundler,Elffers/bundler,agis-/bundler,ligi/bundler,masarakki/bundler,jasonkarns/bundler,steved/bundler,chulkilee/bundler,davydovanton/bundler,lmtim/bundler,roseweixel/bundler,TimMoore/bundler,haocafes/bundler,schaary/bundler,chef/bundler,chef/bundler,TimMoore/bundler