Getting Ready to Release ```v2.1.0```

The big merge from ```unstable``` to ```master```.