0.6.3 release - please don't use 0.6.2
Merge branch 'release/0.6.3' into develop