Merge branch 'tfs-stable-2.5.5' of http://code.taobao.org/svn/tfs/branches/stable-2.5.5