Update to 2.1-SNAPSHOT for development towards next release