Merge "Support connecting to networks with misconfigured subnet masks." automerge: 106da5b
automerge: fb69689

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