roll version 0.10.12
Merge branch 'release/0.10.12' into develop