Backport 8657 from trunk; patch by C. Gohlke; closes 3151544
Authored by: efiring 2011-01-12
Parent: [r8906]
Child: [r8908]