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