Update from 1.0.0-stable
4 files changed