Comic-Con International is staying in San Diego until 2018 at least