fixing bug 1275

--HG--
extra : source : f7189238fbf94eb2a3023c907a1babba35861981
fixing changelog for 1.4
fixing changelog merge
Merge pull request #531 from einhverfr/1.4

fixing bug 1275