Rolling version to 1.6-SNAPSHOT