Merge branch 'develop' into fix-var-shadowing-compiler-warnings

Author: adamstark