Cleanly re-applied all changes 0.7.0->0.7.1
2 files changed