roll version
Merge branch 'release/0.12.5' into develop