Bring CHANGELOG updates for 0.9.x onto master