Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 23:58:46 PST 2014