Merge trunk r5413:5743 to drhj branch
Authored by: vincent_cave 2013-01-23
Parent: [r5745]
Child: [r5747]