Fixed typo in transition guide.
Merge remote-tracking branch 'upstream/master'