Issue #24423: merger from 3.5

This commit is contained in:
Ned Deily 2015-06-10 15:44:18 -07:00
commit adf03c3544