0.12
Merge branch 'release/0.12' into develop