Update CHANGELOG and CONTRIBUTORS for previous merge