Merge branch 'feature/shut-up-compiler-warnings-gcc8' into 'master'
Get rid of shadowed/unused variable/typedef gcc-8 warnings
See merge request !445 (merged)
(cherry picked from commit b04092da)
4a990c33 Get rid of shadowed/unused variable/typedef gcc-8 warnings