Merge 2.0

Ready to deploy 2.0. It should be in master for this.