Fixed merge conflict merging next into sam_header_cleanup.
Fixed merge conflict merging next into sam_header_cleanup.

scripni/rethinkdb,pap/rethinkdb,AntouanK/rethinkdb,robertjpayne/rethinkdb,captainpete/rethinkdb,rrampage/rethinkdb,elkingtonmcb/rethinkdb,spblightadv/rethinkdb,catroot/rethinkdb,eliangidoni/rethinkdb,mcanthony/rethinkdb,spblightadv/rethinkdb,pap/rethinkdb,matthaywardwebdesign/rethinkdb,jesseditson/rethinkdb,grandquista/rethinkdb,losywee/rethinkdb,JackieXie168/rethinkdb,lenstr/rethinkdb,KSanthanam/rethinkdb,yaolinz/rethinkdb,yakovenkodenis/rethinkdb,mbroadst/rethinkdb,sebadiaz/rethinkdb,KSanthanam/rethinkdb,bchavez/rethinkdb,grandquista/rethinkdb,eliangidoni/rethinkdb,grandquista/rethinkdb,bpradipt/rethinkdb,yaolinz/rethinkdb,wojons/rethinkdb,ajose01/rethinkdb,Wilbeibi/rethinkdb,tempbottle/rethinkdb,mquandalle/rethinkdb,scripni/rethinkdb,yaolinz/rethinkdb,marshall007/rethinkdb,robertjpayne/rethinkdb,captainpete/rethinkdb,pap/rethinkdb,niieani/rethinkdb,losywee/rethinkdb,greyhwndz/rethinkdb,urandu/rethinkdb,yakovenkodenis/rethinkdb,mbroadst/rethinkdb,tempbottle/rethinkdb,alash3al/rethinkdb,Wilbeibi/rethinkdb,ayumilong/rethinkdb,urandu/rethinkdb,catroot/rethinkdb,yakovenkodenis/rethinkdb,eliangidoni/rethinkdb,catroot/rethinkdb,jesseditson/rethinkdb,lenstr/rethinkdb,gdi2290/rethinkdb,gavioto/rethinkdb,Qinusty/rethinkdb,scripni/rethinkdb,bpradipt/rethinkdb,mquandalle/rethinkdb,pap/rethinkdb,spblightadv/rethinkdb,rrampage/rethinkdb,bchavez/rethinkdb,mbroadst/rethinkdb,losywee/rethinkdb,wujf/rethinkdb,robertjpayne/rethinkdb,sontek/rethinkdb,alash3al/rethinkdb,pap/rethinkdb,robertjpayne/rethinkdb,bpradipt/rethinkdb,bchavez/rethinkdb,victorbriz/rethinkdb,marshall007/rethinkdb,KSanthanam/rethinkdb,sontek/rethinkdb,victorbriz/rethinkdb,wujf/rethinkdb,bpradipt/rethinkdb,KSanthanam/rethinkdb,Wilbeibi/rethinkdb,sbusso/rethinkdb,4talesa/rethinkdb,mcanthony/rethinkdb,Wilbeibi/rethinkdb,sbusso/rethinkdb,tempbottle/rethinkdb,jesseditson/rethinkdb,scripni/rethinkdb,wkennington/rethinkdb,lenstr/rethinkdb,AntouanK/rethinkdb,robertjpayne/rethinkdb,marshall007/rethinkdb,rrampage/rethinkdb,urandu/rethinkdb,sontek/rethinkdb,bchavez/rethinkdb,matthaywardwebdesign/rethinkdb,victorbriz/rethinkdb,victorbriz/rethinkdb,Wilbeibi/rethinkdb,alash3al/rethinkdb,KSanthanam/rethinkdb,elkingtonmcb/rethinkdb,bpradipt/rethinkdb,robertjpayne/rethinkdb,jmptrader/rethinkdb,dparnell/rethinkdb,gavioto/rethinkdb,rrampage/rethinkdb,spblightadv/rethinkdb,ayumilong/rethinkdb,jmptrader/rethinkdb,sbusso/rethinkdb,marshall007/rethinkdb,RubenKelevra/rethinkdb,greyhwndz/rethinkdb,RubenKelevra/rethinkdb,tempbottle/rethinkdb,eliangidoni/rethinkdb,greyhwndz/rethinkdb,jesseditson/rethinkdb,sontek/rethinkdb,yaolinz/rethinkdb,wkennington/rethinkdb,wujf/rethinkdb,captainpete/rethinkdb,sontek/rethinkdb,greyhwndz/rethinkdb,yakovenkodenis/rethinkdb,sbusso/rethinkdb,urandu/rethinkdb,mquandalle/rethinkdb,rrampage/rethinkdb,ajose01/rethinkdb,JackieXie168/rethinkdb,jesseditson/rethinkdb,catroot/rethinkdb,urandu/rethinkdb,4talesa/rethinkdb,sontek/rethinkdb,tempbottle/rethinkdb,elkingtonmcb/rethinkdb,dparnell/rethinkdb,RubenKelevra/rethinkdb,catroot/rethinkdb,RubenKelevra/rethinkdb,robertjpayne/rethinkdb,mquandalle/rethinkdb,dparnell/rethinkdb,bchavez/rethinkdb,yaolinz/rethinkdb,gdi2290/rethinkdb,dparnell/rethinkdb,niieani/rethinkdb,bchavez/rethinkdb,eliangidoni/rethinkdb,wujf/rethinkdb,gdi2290/rethinkdb,bchavez/rethinkdb,4talesa/rethinkdb,wojons/rethinkdb,niieani/rethinkdb,alash3al/rethinkdb,yakovenkodenis/rethinkdb,elkingtonmcb/rethinkdb,bpradipt/rethinkdb,ayumilong/rethinkdb,urandu/rethinkdb,grandquista/rethinkdb,spblightadv/rethinkdb,jmptrader/rethinkdb,mcanthony/rethinkdb,lenstr/rethinkdb,niieani/rethinkdb,ayumilong/rethinkdb,jmptrader/rethinkdb,lenstr/rethinkdb,ayumilong/rethinkdb,alash3al/rethinkdb,losywee/rethinkdb,robertjpayne/rethinkdb,jmptrader/rethinkdb,sontek/rethinkdb,wojons/rethinkdb,KSanthanam/rethinkdb,tempbottle/rethinkdb,catroot/rethinkdb,jmptrader/rethinkdb,victorbriz/rethinkdb,sebadiaz/rethinkdb,sebadiaz/rethinkdb,elkingtonmcb/rethinkdb,bchavez/rethinkdb,gavioto/rethinkdb,wojons/rethinkdb,ayumilong/rethinkdb,Wilbeibi/rethinkdb,Qinusty/rethinkdb,victorbriz/rethinkdb,scripni/rethinkdb,robertjpayne/rethinkdb,AntouanK/rethinkdb,yaolinz/rethinkdb,mbroadst/rethinkdb,eliangidoni/rethinkdb,grandquista/rethinkdb,bchavez/rethinkdb,scripni/rethinkdb,captainpete/rethinkdb,sbusso/rethinkdb,AntouanK/rethinkdb,wkennington/rethinkdb,niieani/rethinkdb,dparnell/rethinkdb,4talesa/rethinkdb,wkennington/rethinkdb,wojons/rethinkdb,yakovenkodenis/rethinkdb,mcanthony/rethinkdb,greyhwndz/rethinkdb,yakovenkodenis/rethinkdb,niieani/rethinkdb,dparnell/rethinkdb,Qinusty/rethinkdb,eliangidoni/rethinkdb,grandquista/rethinkdb,victorbriz/rethinkdb,rrampage/rethinkdb,gdi2290/rethinkdb,AntouanK/rethinkdb,niieani/rethinkdb,yaolinz/rethinkdb,greyhwndz/rethinkdb,mbroadst/rethinkdb,ayumilong/rethinkdb,gavioto/rethinkdb,gavioto/rethinkdb,JackieXie168/rethinkdb,grandquista/rethinkdb,mquandalle/rethinkdb,rrampage/rethinkdb,gavioto/rethinkdb,mcanthony/rethinkdb,scripni/rethinkdb,mcanthony/rethinkdb,matthaywardwebdesign/rethinkdb,sbusso/rethinkdb,marshall007/rethinkdb,Qinusty/rethinkdb,wujf/rethinkdb,ajose01/rethinkdb,alash3al/rethinkdb,victorbriz/rethinkdb,losywee/rethinkdb,jesseditson/rethinkdb,Qinusty/rethinkdb,bpradipt/rethinkdb,wkennington/rethinkdb,spblightadv/rethinkdb,JackieXie168/rethinkdb,losywee/rethinkdb,wkennington/rethinkdb,sbusso/rethinkdb,matthaywardwebdesign/rethinkdb,4talesa/rethinkdb,ajose01/rethinkdb,lenstr/rethinkdb,matthaywardwebdesign/rethinkdb,mquandalle/rethinkdb,wojons/rethinkdb,marshall007/rethinkdb,bpradipt/rethinkdb,JackieXie168/rethinkdb,ajose01/rethinkdb,Qinusty/rethinkdb,captainpete/rethinkdb,elkingtonmcb/rethinkdb,wkennington/rethinkdb,sebadiaz/rethinkdb,jesseditson/rethinkdb,marshall007/rethinkdb,losywee/rethinkdb,wkennington/rethinkdb,captainpete/rethinkdb,sebadiaz/rethinkdb,AntouanK/rethinkdb,Wilbeibi/rethinkdb,greyhwndz/rethinkdb,gavioto/rethinkdb,Qinusty/rethinkdb,dparnell/rethinkdb,matthaywardwebdesign/rethinkdb,wujf/rethinkdb,mcanthony/rethinkdb,sebadiaz/rethinkdb,ajose01/rethinkdb,Qinusty/rethinkdb,jmptrader/rethinkdb,catroot/rethinkdb,dparnell/rethinkdb,jmptrader/rethinkdb,4talesa/rethinkdb,gdi2290/rethinkdb,AntouanK/rethinkdb,matthaywardwebdesign/rethinkdb,eliangidoni/rethinkdb,Qinusty/rethinkdb,gavioto/rethinkdb,niieani/rethinkdb,matthaywardwebdesign/rethinkdb,4talesa/rethinkdb,dparnell/rethinkdb,grandquista/rethinkdb,alash3al/rethinkdb,elkingtonmcb/rethinkdb,urandu/rethinkdb,tempbottle/rethinkdb,gdi2290/rethinkdb,RubenKelevra/rethinkdb,tempbottle/rethinkdb,KSanthanam/rethinkdb,JackieXie168/rethinkdb,grandquista/rethinkdb,lenstr/rethinkdb,ayumilong/rethinkdb,KSanthanam/rethinkdb,mcanthony/rethinkdb,4talesa/rethinkdb,rrampage/rethinkdb,pap/rethinkdb,captainpete/rethinkdb,AntouanK/rethinkdb,captainpete/rethinkdb,greyhwndz/rethinkdb,eliangidoni/rethinkdb,sebadiaz/rethinkdb,gdi2290/rethinkdb,RubenKelevra/rethinkdb,sbusso/rethinkdb,ajose01/rethinkdb,pap/rethinkdb,mquandalle/rethinkdb,JackieXie168/rethinkdb,pap/rethinkdb,sontek/rethinkdb,catroot/rethinkdb,RubenKelevra/rethinkdb,yakovenkodenis/rethinkdb,mbroadst/rethinkdb,jesseditson/rethinkdb,wujf/rethinkdb,wojons/rethinkdb,yaolinz/rethinkdb,spblightadv/rethinkdb,Wilbeibi/rethinkdb,elkingtonmcb/rethinkdb,scripni/rethinkdb,urandu/rethinkdb,sebadiaz/rethinkdb,mbroadst/rethinkdb,mbroadst/rethinkdb,marshall007/rethinkdb,JackieXie168/rethinkdb,alash3al/rethinkdb,mquandalle/rethinkdb,lenstr/rethinkdb,wojons/rethinkdb,spblightadv/rethinkdb,losywee/rethinkdb,ajose01/rethinkdb,mbroadst/rethinkdb,bpradipt/rethinkdb,JackieXie168/rethinkdb,RubenKelevra/rethinkdb