Removed redeclaration of variable
Merge branch 'master' into iridis