Comment # 6 on bug 1158839 from Nathaniel Graham

I did master only but can push to the stable branch if you think that makes
sense.