aa6dd67866
branch. This is also to minimize differences with upstream. MFC after: 3 weeks X-MFC-With: r262613
branch. This is also to minimize differences with upstream. MFC after: 3 weeks X-MFC-With: r262613