Updated patches for trunk.