Sync'd branch integration/b2g-inbound with upstream @ Mon Nov  3 19:18:49 PST 2014