Upstream changes

Automatically opened by http://forkbomb.io
Line is too long. [97/80]<br>Use `&&` instead of `and`.