Reduced Connection-Timeouts for the Server
Merge remote-tracking branch 'origin/master'