Rename variable to avoid shadowing
Merge branch 'master' of https://git.dune-project.org/repositories/dune-istl