Upstream changes

Automatically opened by http://forkbomb.io