Upstream changes

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