Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 08:48:44 PST 2014