fix http://wenda.wecenter.com/question/17046
Merge branch 'master' into github