Upstream

Just tying up a loose end.