Merge branch 'master' of github.com:dianping/cat
Merge pull request #703 from leonindy/master

merge newest code which can solve test failures