Not sure if we want to merge these two bugs or not, but upstream this issue is tracked in bug 1240382
Not sure if we want to merge these two bugs or not, but upstream this issue is tracked in bug 1240382