unused variable
CID 1164065:  Copy-paste error
Merge branch 'master' into portable