Sync'd branch integration/b2g-inbound with upstream @ Fri Nov  7 15:58:52 PST 2014