Version bump to 2.1-SNAPSHOT