Post 2.6.5rc1 cleanup.
2 files changed