Set everything globally
Merge remote-tracking branch 'origin/master' into optus

* origin/master:
  Set everything globally