forward-port the 0.2.4.18-rc changelog