Removed unused variable to get rid of a warning
Merge branch 'master' into release-3.0