Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 16:09:14 PST 2014