Update to upstream revision bb4227d