Latest upstream

@drdee trying again with less force.