Uuups.. merge warnings has snuck into the changelog