1.0.x

Merge conflicts resolved, no files changed