Fix import in pyflakes
Fix pyflakes
Update version
Merge branch 'release/3.0.2' into develop