Merge pull request #2676 from stintel/keepalived