merged patch; bug left open