Update upstream. Fixes #798