Update from 1.0.0 stable branch.
3 files changed