Merge 2.6.8rc tags into 2.7.