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