Fix git flow problem in script
Merge branch 'release/v0.6.6'