Fix for Issue #666 (OTS review by Marc).
Fix for Issue #666 (OTS review by Marc).

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