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