osx subnet conflict
Merge branch 'master' into github-pages

* master:
  osx subnet conflict
deploy