Updates from 0.9.8-stable branch.
3 files changed