Bug 930590 - Sync manifestdestiny with m-c;r=edmorley

--HG--
extra : rebase_source : 425d5dfa0ae7dbd356bbfe3947fc29838294c1bb