Bumping to 2.1.8-SNAPSHOT