Fix for 1271

--HG--
extra : source : 0b83356d20d4cf6ec4dc8a63796610319c44d66e
Changelog entry for bug 1271
Merge pull request #520 from einhverfr/1.3

fix for 1271
fixing bug 1275
Merge pull request #530 from einhverfr/1.3

fixing bug 1275