Fix develop.py pyflakes
Merge pull request #3452 from yakky/feature/pyflakes_fix

Fix develop.py pyflakes
Merge remote-tracking branch 'upstream/develop' into develop