Updated for the 2.0 release
Merge remote-tracking branch 'origin/2.0'
Shift the target to 2.1