Bump version.
Fix failing test.
Merge branch '0.11' into develop