Merge pull request #844 from sipa/shutdownfix