added changelog
Merge branch 'master' into backport_intellij_13