Reworded and rephrased the first two sections.
Merge remote-tracking branch 'upstream/master'