release 0.6.3
Merge branch '0.6'