Emma: collector-websocket: timeout of 5 minutes added
Merge branch 'master' of https://github.com/nordinh/ipsum.git