Update from 0.9.8-stable
3 files changed