am a034362b: Merge "Make server port option work on windows"

* commit 'a034362be4dc69d3432d7587089d371dc871e811':
  Make server port option work on windows