Version bump
Merge branch 'release/v0.12' into develop