1.1.1dev: merge from 1.0-stable (part of #10997)
Authored by: jomae 2013-01-17
Parent: [r11519]
Child: [r11521]