Test with 2.1.0-rc1

Conflicts:
	.travis.yml