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