0.6.3
Merge branch 'release/0.6.3'