Small modifications to bring trunk into agreement with 2.5.38
Authored by: jrifkin 2012-05-25
Parent: [r29]
Child: [r31]