Merge branch 'develop' into feature-adjust-functional-tests
[kamaki] / version
1 0.9next