Bug 957075 - Add missing parentheses, silence an MSVC warning. r=shu

--HG--
extra : rebase_source : 5c95b5a56b3e03cb2933582226ce03d32df23a85
Bug 950462 - Clear template object convert-double-elements flag if needed. r=h4writer

--HG--
extra : rebase_source : 39f449e09dbf3ffa77f56d382586409342eadc42