merge from trac:r11835
merge from trac:r11837
merge from trac:r11838
merge from trac:r11839
Merge branch 'v0.12-py25' into v0.12-py24