Bug 1065774 - Be more precise in PromiseFlatString docs about why assigning PromiseFlatString(...) to a reference is safe.  r=froydnj

--HG--
extra : rebase_source : aad06aa3b0a803abb678000f559b4a9d4736813c
Bug 1041426 - Make error message for unexpected token more clear.  r=jwalden

--HG--
extra : rebase_source : 1785f67732a81aa29dd81c8be765cf497a9b74c8