Merge dev to master for release 2.0.0

Merge dev to master for release 2.0.0, not much here.