Merge "Support connecting to networks with misconfigured subnet masks." automerge: bd01ceb automerge: fb69689
automerge: 4137d5f

* commit '4137d5fd3ec8bd1dfb898fd92307db81c3648b3c':
  Support connecting to networks with misconfigured subnet masks.