bug 991393 - update flame branches. r=hwine a=npotb DONTBUILD