Changed servers on reeti
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into sockets-servers
Merge branch 'develop' into sockets-servers
Merge pull request #343 from mbehrooz/sockets-servers

Sockets robustness for servers on reeti
Merge remote-tracking branch 'upstream/develop' into develop