Couple of formatting changes.
Merge remote-tracking branch 'github/master' into develop