Fixing 1262, 1.4

--HG--
extra : source : 6ceffda443cef955092dc94391d41b680c075c13
Changelog update for 1262 fix

--HG--
extra : source : 75b7b3105d0afd9088e1c2898105c25718ce9baf