Applying rev 4364 to the 2.3.x branch.
Authored by: hansfn 2014-07-18
Parent: [r4364]
Child: [r4366]