Merge pull request #2654 from vlakoff/develop

Fix duplicate changelog entry