another bugfix
Merge branch 'upstream'
Merge pull request #2 from hinesmr/master

Fix for the gmetad restart problem