Merge from 0.9.8-stable.
1 file changed