0.10
Merge branch 'release/0.10' into develop
develop is 0.11dev now.