Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  Revert the change to spacing in #517
  Minor spacing fix for main navigation
  _s: Document background color fallback.
Changed lone uppercase H to lower
Correcting some irregular capitalisation and coding standards issues
Undid my multiline function corrections
Merge pull request #524 from jacklenox/dev

Capitalisation and coding standards corrections - props @jacklenox
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  Undid my multiline function corrections
  Correcting some irregular capitalisation and coding standards issues
  Changed lone uppercase H to lower
Merge remote-tracking branch 'upstream/ja'

* upstream/ja:
  Undid my multiline function corrections
  Correcting some irregular capitalisation and coding standards issues
  Changed lone uppercase H to lower