Fix CHANGELOG from last 2 merges
Fix CHANGELOG from last 2 merges

Apparently my ide merged it wrong and removed [this change](https://github.com/styled-components/styled-components/pull/874/files) in my [pr](https://github.com/styled-components/styled-components/commit/6854486c6c791bed3cc62a7e98235f1f167a267b)
css-components/styled-components,JamieDixon/styled-components,JamieDixon/styled-components,JamieDixon/styled-components,styled-components/styled-components,styled-components/styled-components,styled-components/styled-components