Fix formatting and correct some grammar-os.
Merge remote-tracking branch 'upstream/master'