We're working on 0.6.4
Merge remote-tracking branch 'origin/1.6.2' into 1.6.2