we should have the CHANGELOG in master