Update upstream. Fixes #213.