Merge pull request #964 from nicolasdespres/sighup