Move to 6.1-SNAPSHOT