fix #6653
Merge pull request #6654 from ivarne/release-0.2

fix #6653