Merge pull request #2772 from WeiHeCN/master