update changelog
Merge branch 'master' into vote-performance