Tag for hotfix 0.6.2 - not merged into master