2.5.11
RC for stable 2.5