Merge pull request #1119 from sipa/fastshutdown