Merge pull request #2437 from stintel/strongswan