Import fixes for the previous commit.
Authored by: bugman 2013-04-20
Parent: [r19513]
Child: [r19515]