Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 14:53:45 PST 2014