BUMP 2.6.4
Revert "BUMP 2.6.4"

This reverts commit baeb1573b5f763b73851214436e03c3087b1299b.
BUMP 2.6.4-rc0
Merge remote-tracking branch 'upstream/v2.6' into v2.6