Comment 11 for bug 1518440

Thanks Ryan for patch from upstream and testing though -- gave better confidence for updating to latest upstream version.

Please test new version when it lands too, to make sure that I and/or upstream didn't mess anything up.