Updated for upstream 0.8.19