parenthize generator expression
Merge branch 'master' into hotfix