merge from trac:r11833