Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 13:04:05 PST 2014