updated changelog
Merge commit '396e4c75b4bd429924b33f2cd5958f92775cdc42'