fix http://wenda.wecenter.com/question/17770 and http://wenda.wecenter.com/question/17624
Merge branch 'master' into github