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