Update upstream. (Fix PathSet serialization. Fixes #294.)