Tweaked the upgrading guide
Merge remote-tracking branch 'origin/2.0' into 2.1
Fixed a few typos
Merge remote-tracking branch 'origin/2.1'