silence some pyflakes errors
Merge remote-tracking branch 'origin/pyflakes'