remove unused argument pBlock
Merge pull request #914 from licaiguo/remove-unused-args

remove unused argument pBlock
Merge remote-tracking branch 'upstream/master' into travis.osx