Merge from 3.6.
1 file changed