merge from trac:r11835
merge from trac:r11837
merge from trac:r11838
merge from trac:r11839