Bump upstream 0.6.3 -> 0.6.4