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