Upstreams, and bumped coffee version to 1.5