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