Connection closing on shutdown

[laugengebaeck]

What does this change?

[Bug] This fixes #397 using the approach already described in the issue.

Checklist

• [x] Your branch has no merge conflicts with master
• [x] All related commits are squashed together

[coveralls]

Pull Request Test Coverage Report for Build 1082998945

• 0 of 0 changed or added relevant lines in 0 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 75.51%

---

Totals
Change from base Build 1082713627:	0.0%
Covered Lines:	1147
Relevant Lines:	1519

---

💛 - Coveralls