Merge from 3.5

Hg: --