Update version
Merge branch 'rel-0.6.1' into stable
Merge branch 'stable'