Relabelling this bug to reflect the patch that was committed for it, so that it doesn't look like a simple duplicate of Bug 1267239
Relabelling this bug to reflect the patch that was committed for it, so that it doesn't look like a simple duplicate of Bug 1267239