merge from alibaba/taokeeper 20131227