[CHANGELOG] Update to reflect current master