Update upstream: Fixes #1062