Resolved merge issue from 5_11 to head
Authored by: rkisson 2011-12-01
Parent: [r5767]
Child: [r5769]