Sync'd branch integration/b2g-inbound with upstream @ Thu Nov  6 07:17:26 PST 2014