Upstream update.

Includes a change in Camp which allows certain unicode paths to fly.