fd995abc9a
These changes were made to master in 85880a6490
but never made it to the 1.2.x branch.
These changes were made to master in 85880a6490
but never made it to the 1.2.x branch.