Update from 1.0.0-stable
3 files changed