Changelog update and sql fix for 1228

--HG--
extra : source : f61e92acc00f9cb9a9f5ab7d3752627047dc01cd