Merge pull request #3357 from stintel/strongswan