Fix for 1271
Changelog entry for bug 1271

--HG--
extra : source : b1f7f982576105f084c591f195c1d979a7fcadc7