Be more inclusive
Parenthesis position is quite critical.
Merge remote-tracking branch 'upstream/master'

Merge upstream fixes
it kinda works