Updates for our 2.0 release
Merge remote-tracking branch 'origin/master'