build as 0.6.4
Merge remote-tracking branch 'origin/master'
remaining change