Update from 0.9.8-stable.
6 files changed