Merge branch 'hotfix-0.12.1' into develop
[kamaki] / version
1 0.12next