Tweaks and fixes from last merge
Tweaks and fixes from last merge

Feitianyuan/goread,mikecb/goread,youprofit/goread,mjibson/goread,Feitianyuan/goread,Feitianyuan/goread,P7h/goread,mgaitan/goread,wangjun/goread,doublehou/goread,beni55/goread,mjibson/goread,doublehou/goread,mjibson/goread,elancom/goread,youprofit/goread,mikecb/goread,wangjun/goread,P7h/goread,beni55/goread,youprofit/goread,lnmx/goread,elancom/goread,lnmx/goread,mikecb/goread,elancom/goread,doublehou/goread,mgaitan/goread,lnmx/goread,beni55/goread,mgaitan/goread,P7h/goread,wangjun/goread