Minor fix
Merge branch 'linting' into develop
Linting
Merge branch 'linting' into develop
Merge branch 'develop' into python3