Localhost variable fix
Merge branch 'testing'

* testing:
  Localhost variable fix