merge from trac:r11802