Issue 24366: Merge 3.3

This commit is contained in:
Yury Selivanov 2015-06-02 18:54:09 -04:00
commit e12685757f