Prepare release for 2.1

Ping @arekkas @danizord @jmleroux