Upstream changes

Automatically opened by http://forkbomb.io
Redundant `return` detected.