Added by Constantinos Venetsanopoulos over 11 years ago
Merge remote branch 'google/stable-2.6' into stable-2.6-esi