Added proper interrupt handling to server.
Merge branch 'master' into dev
Added proper interrupt handling to server.
Merge branch 'master' into dev