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