alternate method of adding $extra_headers and not overwriting $extra_headers added by other plugins.
Merge branch 'refs/heads/fix/keep_extra_headers' into develop
version bump and CHANGES fix
Merge branch 'refs/heads/develop'