bumbed version number
Merge branch 'release/0.12' into develop