forward-port changelog from 0.2.5.7-rc