Fixing bug 1251 that affects some backports only
Merge pull request #449 from einhverfr/1.3

Fixing bug 1251 that affects some backports only