Merge r11674 from 1.0-stable (tag_build = dev)
Authored by: cboos 2013-02-03
Parent: [r11680]
Child: [r11682]