still commenting
Merge remote-tracking branch 'upstream/noMockServer' into noMockServer
Merge pull request #256 from rjynn/noMockServer

No mock server