Merge in Matt Metcalf's fork