Bug 930590 - Sync manifestdestiny with m-c