Whitespace cleanup
Cleanup <head>
Merge branch 'master' into production

* master:
  Cleanup <head>
  Whitespace cleanup