Fix for duplicate access control headers
Merge pull request #533 from JudahGabriel/upstream

Fix for duplicate access control headers