Cleanup shutdown procedure
Force exit after clean shutdown
Merge pull request #224 from quixoten/clean_shutdown

Clean shutdown
Bump version to v3.3.6
Merge branch '3-3-stable'