Remove use of redundant variable
Merge branch 'master' into mymaster