Upstream changes

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