Updated version to 1.6.4-R2.1-SNAPSHOT for development towards next release.