version bump
Merge branch 'master' into v0.10