Release 2.1.0-RC1

@szeiger have a quick look and merge if its fine.
This version is broken, too, it needs to be 2.1