Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 05:24:39 PST 2014