1.1.1dev: merged //Modify// ticket change from 1.0-stable (#10856)
Authored by: cboos 2013-01-26
Parent: [r11536]
Child: [r11538]